avahi: moved to github
avahi: moved to github

git-svn-id: svn://svn.openwrt.org/openwrt/packages@41708 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/libs/apr-util/Makefile (deleted)
#  
# Copyright (C) 2007-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=apr-util  
PKG_VERSION:=1.3.12  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr  
PKG_MD5SUM:=0f671b037ca62751a8a7005578085560  
 
PKG_FIXUP:=autoreconf  
PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
include $(INCLUDE_DIR)/nls.mk  
 
define Package/libaprutil  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libapr +libexpat +libsqlite3 +libuuid $(ICONV_DEPENDS)  
TITLE:=Apache Portable Runtime Utility Library  
URL:=http://apr.apache.org/  
endef  
 
TARGET_CFLAGS += $(FPIC)  
TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE  
 
CONFIGURE_ARGS += \  
--with-pgsql=no \  
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \  
--with-expat="$(STAGING_DIR)/usr" \  
--without-sqlite2 \  
--with-sqlite3="$(STAGING_DIR)/usr" \  
--with-iconv="$(ICONV_PREFIX)" \  
 
CONFIGURE_VARS += \  
ac_cv_file_dbd_apr_dbd_mysql_c=no \  
ac_cv_path_ODBC_CONFIG= \  
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \  
 
MAKE_FLAGS += \  
APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \  
$(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \  
$(1)/usr/include/apr-1/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \  
$(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \  
$(1)/usr/lib/pkgconfig/  
$(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config  
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config  
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config  
$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config  
$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config  
endef  
 
define Package/libaprutil/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libaprutil))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -8,6 +8,7 @@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VER  
APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@  
 
srcdir = @srcdir@  
+top_builddir = @top_builddir@  
VPATH = @srcdir@  
 
INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@  
--- a/configure.in  
+++ b/configure.in  
@@ -40,6 +40,8 @@ AC_SUBST(APU_CONFIG_LOCATION)  
AC_CANONICAL_SYSTEM  
 
AC_PROG_INSTALL  
+AC_PROG_LIBTOOL  
+LT_INIT  
 
# Use -no-install to link the test programs on all platforms  
# but Darwin, where it would cause the programs to be linked  
 
file:a/libs/apr/Makefile (deleted)
#  
# Copyright (C) 2007-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=apr  
PKG_VERSION:=1.4.5  
PKG_RELEASE:=2  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2  
PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr  
PKG_MD5SUM:=8b53f5a5669d0597f2da889a2f576eb6  
 
PKG_FIXUP:=autoreconf  
PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libapr  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libpthread +librt +libuuid  
TITLE:=Apache Portable Runtime Library  
URL:=http://apr.apache.org/  
endef  
 
TARGET_CFLAGS += $(FPIC)  
TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE  
 
CONFIGURE_ARGS += \  
--with-devrandom=/dev/urandom \  
--disable-dso \  
--enable-ipv6  
 
# XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure  
CONFIGURE_VARS += \  
ac_cv_sizeof_struct_iovec=1 \  
ac_cv_struct_rlimit=yes \  
apr_cv_process_shared_works=no \  
apr_cv_mutex_robust_shared=no \  
apr_cv_tcp_nodelay_with_cork=yes \  
apr_cv_use_lfs64=yes \  
LDFLAGS="$$$$LDFLAGS -lpthread" \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \  
$(1)/usr/bin/  
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \  
$(1)/usr/include/apr-1/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \  
$(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \  
$(1)/usr/lib/pkgconfig/  
$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \  
$(1)/usr/share/build-1/  
$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config  
$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config  
$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config  
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config  
$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config  
$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config  
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk  
endef  
 
define Package/libapr/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libapr))  
 
--- a/Makefile.in  
+++ b/Makefile.in  
@@ -3,6 +3,7 @@ srcdir=@srcdir@  
VPATH=@srcdir@  
top_srcdir=@apr_srcdir@  
top_blddir=@apr_builddir@  
+top_builddir=@top_builddir@  
 
#  
# APR (Apache Portable Runtime) library Makefile.  
--- a/configure.in  
+++ b/configure.in  
@@ -246,9 +246,6 @@ case $host in  
gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c  
;;  
*)  
- if test "x$LTFLAGS" = "x"; then  
- LTFLAGS='--silent'  
- fi  
if test "$experimental_libtool" = "yes"; then  
# Use a custom-made libtool replacement  
echo "using jlibtool"  
 
https://dev.openwrt.org/ticket/9287  
 
--- a/time/unix/time.c  
+++ b/time/unix/time.c  
@@ -75,7 +75,7 @@ APR_DECLARE(apr_time_t) apr_time_now(voi  
{  
struct timeval tv;  
gettimeofday(&tv, NULL);  
- return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec;  
+ return tv.tv_sec * (apr_time_t)APR_USEC_PER_SEC + (apr_time_t)tv.tv_usec;  
}  
 
static void explode_time(apr_time_exp_t *xt, apr_time_t t,  
 
file:a/libs/avahi/Makefile (deleted)
#  
# 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  
 
ifeq ($(BUILD_VARIANT),dbus)  
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)  
PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)  
else  
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)/nodbus/$(PKG_NAME)-$(PKG_VERSION)  
PKG_ALT_DIR=$(BUILD_DIR)/$(PKG_NAME)/dbus/$(PKG_NAME)-$(PKG_VERSION)  
endif  
 
 
PKG_NAME:=avahi  
PKG_VERSION:=0.6.31  
PKG_RELEASE:=5  
 
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://avahi.org/download/  
PKG_MD5SUM:=2f22745b8f7368ad5a0a3fddac343f2d  
 
PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus  
 
PKG_FIXUP:=autoreconf  
PKG_REMOVE_FILES:=autogen.sh  
 
PKG_INSTALL:=1  
PKG_BUILD_PARALLEL:=1  
 
 
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/avahi/Default  
SECTION:=net  
CATEGORY:=Network  
TITLE:=An mDNS/DNS-SD implementation  
URL:=http://www.avahi.org/  
endef  
 
define Package/avahi/Default/description  
Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf)  
implementation (library). It facilitates  
service discovery on a local network -- this means that  
you can plug your laptop or computer into a network and  
instantly be able to view other people who you can chat with,  
find printers to print to or find files being shared.  
This kind of technology is already found in MacOS X  
(branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')  
and is very convenient.  
endef  
 
define Package/libavahi  
$(call Package/avahi/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libpthread +SSP_SUPPORT:libssp  
TITLE+= (library)  
endef  
 
define Package/libavahi/description  
$(call Package/avahi/Default/description)  
.  
The libavahi package contains the mDNS/DNS-SD shared libraries,  
used by other programs. Specifically, it provides  
libavahi-core and libavahi-common libraries.  
By default, it is built without D-Bus support,  
i.e. the --disable-dbus configuration flag is set.  
To enable D-Bus support, select the package  
libavahi-dbus-support.  
endef  
 
define Package/avahi-autoipd  
$(call Package/avahi/Default)  
SUBMENU:=IP Addresses and Names  
DEPENDS:=+libdaemon  
TITLE:=IPv4LL network address configuration daemon  
endef  
 
define Package/avahi-autoipd/description  
$(call Package/avahi/Default/description)  
.  
This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local  
Addresses" (IETF RFC3927), a protocol for automatic IP address configuration  
from the link-local 169.254.0.0/16 range without the need for a central  
server. It is primarily intended to be used in ad-hoc networks which lack a  
DHCP server.  
endef  
 
define Package/avahi-daemon  
$(call Package/avahi/Default)  
SUBMENU:=IP Addresses and Names  
ifeq ($(BUILD_VARIANT),dbus)  
DEPENDS:=+libavahi +libexpat +librt +libdaemon +libdbus  
else  
DEPENDS:=+libavahi +libexpat +librt +libdaemon  
endif  
TITLE+= (daemon)  
endef  
 
define Package/avahi-daemon/description  
$(call Package/avahi/Default/description)  
.  
This package contains an mDNS/DNS-SD daemon.  
endef  
 
define Package/avahi-daemon/conffiles  
/etc/avahi/avahi-daemon.conf  
/etc/avahi/services/http.service  
/etc/avahi/services/ssh.service  
endef  
 
define Package/avahi-dnsconfd  
$(call Package/avahi/Default)  
SUBMENU:=IP Addresses and Names  
DEPENDS:=+libavahi +libdaemon  
TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon  
endef  
 
define Package/avahi-dnsconfd/description  
$(call Package/avahi/Default/description)  
.  
This package contains a Unicast DNS server from mDNS/DNS-SD configuration  
daemon, which may be used to configure conventional DNS servers using mDNS  
in a DHCP-like fashion. Especially useful on IPv6.  
endef  
 
define Package/libavahi-dbus-support  
$(call Package/avahi/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
VARIANT:=dbus  
DEPENDS:=+dbus +libavahi  
TITLE+= (D-Bus support)  
endef  
 
define Package/libavahi-dbus-support/description  
$(call Package/libavahi/description)  
.  
The libavahi-dbus-support package enables  
D-Bus support in avahi, needed to support  
the libavahi-client library and avahi-utils.  
Selecting this package modifies the build configuration  
so that avahi packages are built with support for D-BUS enabled;  
it does not generate a separate binary of its own.  
It also automatically adds the D-Bus package to the build.  
libavahi-dbus-support is selected automatically if you select  
libavahi-client or avahi-utils.  
endef  
 
define Package/libavahi-client  
$(call Package/avahi/Default)  
SECTION:=libs  
CATEGORY:=Libraries  
DEPENDS:=+libavahi-dbus-support +avahi-daemon  
TITLE+= (libavahi-client library)  
endef  
 
define Package/libavahi-client/description  
$(call Package/avahi/Default/description)  
.  
This packages adds the libavahi-client library.  
It also automatically adds the required  
libavahi-dbus-support and the avahi-daemon packages.  
For more information please see the avahi documentation.  
endef  
 
define Package/avahi-utils  
$(call Package/avahi/Default)  
SUBMENU:=IP Addresses and Names  
DEPENDS:=+libavahi-client +libgdbm  
TITLE+= (utilities)  
endef  
 
define Package/avahi-utils/description  
$(call Package/avahi/Default/description)  
.  
This packages installs the following avahi utility programs:  
avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name.  
It also automatically adds the required libavahi-client package.  
For more information please see the avahi documentation.  
endef  
 
TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE  
 
CONFIGURE_ARGS+= \  
--enable-shared \  
--enable-static \  
--disable-glib \  
--disable-gobject \  
--disable-qt3 \  
--disable-qt4 \  
--disable-gtk \  
--disable-gtk3 \  
--with-xml=expat \  
--disable-dbm \  
--enable-gdbm \  
--enable-libdaemon \  
--disable-python \  
--disable-pygtk \  
--disable-python-dbus \  
--disable-mono \  
--disable-monodoc \  
--disable-doxygen-doc \  
--disable-doxygen-dot \  
--disable-doxygen-man \  
--disable-doxygen-rtf \  
--disable-doxygen-xml \  
--disable-doxygen-chm \  
--disable-doxygen-chi \  
--disable-doxygen-html \  
--disable-doxygen-ps \  
--disable-doxygen-pdf \  
--disable-xmltoman \  
--with-distro=none \  
--with-avahi-user=nobody \  
--with-avahi-group=nogroup \  
--with-autoipd-user=nobody \  
--with-autoipd-group=nogroup  
 
ifneq ($(CONFIG_SSP_SUPPORT),y)  
CONFIGURE_ARGS+= \  
--disable-stack-protector  
endif  
 
ifeq ($(BUILD_VARIANT),dbus)  
CONFIGURE_ARGS += \  
--enable-dbus  
else  
CONFIGURE_ARGS += \  
--disable-dbus  
endif  
 
CONFIGURE_VARS+= \  
CFLAGS="$$$$CFLAGS -DNDEBUG -DDISABLE_SYSTEMD" \  
ac_cv_header_sys_capability_h=no \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-* $(1)/usr/lib/  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libavahi-dbus-support/install  
$(INSTALL_DIR) $(1)/etc/dbus-1/system.d  
$(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d  
endef  
 
define Package/libavahi/install  
# The next line removes the ".build" file from the "other" build.  
# The effect is that, if the other build is re-selected in the future,  
# the build system will be forced to replace all the code in the  
# installer packages, removing anything from the current build.  
# "Other" means this: if the current build is "dbus", the other is "nodebus",  
# and if the current build is "nodbus", the other is "dbus".  
$(RM) -f $(PKG_ALT_DIR)/.built  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/  
endef  
 
define Package/libavahi-client/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-client.so.* $(1)/usr/lib/  
endef  
 
define Package/avahi-utils/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/  
endef  
 
define Package/avahi-autoipd/install  
$(INSTALL_DIR) $(1)/etc/avahi  
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/  
endef  
 
define Package/avahi-daemon/install  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/  
$(INSTALL_DIR) $(1)/etc/avahi  
$(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/  
$(INSTALL_DIR) $(1)/etc/avahi/services  
$(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service  
$(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service  
$(INSTALL_DIR) $(1)/etc/init.d  
$(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon  
endef  
 
define Package/avahi-dnsconfd/install  
$(INSTALL_DIR) $(1)/etc/avahi  
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/  
$(INSTALL_DIR) $(1)/usr/sbin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/  
endef  
 
$(eval $(call BuildPackage,libavahi-client))  
$(eval $(call BuildPackage,avahi-utils))  
$(eval $(call BuildPackage,libavahi-dbus-support))  
$(eval $(call BuildPackage,libavahi))  
$(eval $(call BuildPackage,avahi-autoipd))  
$(eval $(call BuildPackage,avahi-daemon))  
$(eval $(call BuildPackage,avahi-dnsconfd))  
 
[server]  
#host-name=foo  
#domain-name=local  
use-ipv4=yes  
use-ipv6=no  
check-response-ttl=no  
use-iff-running=no  
 
[publish]  
publish-addresses=yes  
publish-hinfo=yes  
publish-workstation=no  
publish-domain=yes  
#publish-dns-servers=192.168.1.1  
#publish-resolv-conf-dns-servers=yes  
 
[reflector]  
enable-reflector=no  
reflect-ipv=no  
 
[rlimits]  
#rlimit-as=  
rlimit-core=0  
rlimit-data=4194304  
rlimit-fsize=0  
rlimit-nofile=30  
rlimit-stack=4194304  
rlimit-nproc=3  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2006 OpenWrt.org  
START=61  
 
BIN=avahi-daemon  
DEFAULT=/etc/default/$BIN  
OPTIONS="-D"  
RUN_D=/var/run/$BIN  
 
start() {  
[ -f $DEFAULT ] && . $DEFAULT  
mkdir -p $RUN_D  
$BIN $OPTIONS  
}  
 
stop() {  
$BIN -k  
}  
 
reload() {  
$BIN -r  
}  
 
 
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->  
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">  
<service-group>  
<name replace-wildcards="yes">Web Server on %h</name>  
<service>  
<type>_http._tcp</type>  
<port>80</port>  
<txt-record>path=/</txt-record>  
</service>  
</service-group>  
 
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->  
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">  
<service-group>  
<name replace-wildcards="yes">Secure Shell on %h</name>  
<service>  
<type>_ssh._tcp</type>  
<port>22</port>  
</service>  
</service-group>  
 
--- a/Makefile.am  
+++ b/Makefile.am  
@@ -75,8 +75,7 @@ SUBDIRS = \  
avahi-compat-howl \  
avahi-autoipd \  
avahi-ui \  
- avahi-ui-sharp \  
- po  
+ avahi-ui-sharp  
 
DX_INPUT = \  
$(srcdir)/avahi-common/address.h \  
--- a/avahi-python/avahi-discover/Makefile.am  
+++ b/avahi-python/avahi-discover/Makefile.am  
@@ -38,7 +38,6 @@ if HAVE_GDBM  
pythonscripts += \  
avahi-discover  
desktop_DATA += avahi-discover.desktop  
-@INTLTOOL_DESKTOP_RULE@  
avahi_discover_PYTHON += __init__.py  
endif  
 
@@ -46,7 +45,6 @@ if HAVE_DBM  
pythonscripts += \  
avahi-discover  
desktop_DATA += avahi-discover.desktop  
-@INTLTOOL_DESKTOP_RULE@  
avahi_discover_PYTHON += __init__.py  
endif  
 
--- a/avahi-ui/Makefile.am  
+++ b/avahi-ui/Makefile.am  
@@ -78,7 +78,6 @@ endif  
 
bin_PROGRAMS = bssh  
desktop_DATA += bssh.desktop bvnc.desktop  
-@INTLTOOL_DESKTOP_RULE@  
 
bssh_SOURCES = bssh.c  
 
@@ -106,6 +105,4 @@ endif # HAVE_GLIB  
endif  
endif  
 
-@INTLTOOL_DESKTOP_RULE@  
-  
CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)  
--- a/configure.ac  
+++ b/configure.ac  
@@ -23,7 +23,7 @@ AC_INIT([avahi],[0.6.29],[avahi (at) lis  
AC_CONFIG_SRCDIR([avahi-core/server.c])  
AC_CONFIG_MACRO_DIR([common])  
AC_CONFIG_HEADERS([config.h])  
-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])  
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax])  
 
AC_SUBST(PACKAGE_URL, [http://avahi.org/])  
 
@@ -43,8 +43,6 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])  
 
AC_CANONICAL_HOST  
 
-AM_SILENT_RULES([yes])  
-  
AC_CHECK_PROG([STOW], [stow], [yes], [no])  
 
AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [  
@@ -412,12 +410,6 @@ if test "x$have_kqueue" = "xyes" ; then  
AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])  
fi  
 
-IT_PROG_INTLTOOL([0.35.0])  
-GETTEXT_PACKAGE=avahi  
-AC_SUBST([GETTEXT_PACKAGE])  
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])  
-AM_GLIB_GNU_GETTEXT  
-  
avahilocaledir='${prefix}/${DATADIRNAME}/locale'  
AC_SUBST(avahilocaledir)  
 
 
file:a/libs/fcgi/Makefile (deleted)
#  
# Copyright (C) 2007-2011 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=fcgi  
PKG_VERSION:=2.4.0  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.fastcgi.com/dist/  
PKG_MD5SUM:=d15060a813b91383a9f3c66faf84867e  
 
PKG_FIXUP:=libtool-ucxx  
 
PKG_INSTALL:=1  
 
include $(INCLUDE_DIR)/uclibc++.mk  
include $(INCLUDE_DIR)/package.mk  
 
define Package/fcgi/Default  
SECTION:=libs  
CATEGORY:=Libraries  
URL:=http://www.fastcgi.com/  
endef  
 
define Package/fcgi  
$(call Package/fcgi/Default)  
MENU:=1  
DEPENDS:= +libpthread  
TITLE:=Shared library of FastCGI  
endef  
 
define Package/fcgixx  
$(call Package/fcgi/Default)  
DEPENDS:=fcgi $(CXX_DEPENDS)  
TITLE:=Shared library of FastCGI++  
endef  
 
define Package/fcgi/description  
FastCGI is a language independent, scalable, open extension to  
CGI that provides high performance without the limitations of  
server specific APIs.  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
 
CONFIGURE_VARS += \  
LIBS="-lm" \  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/  
$(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi{,++}.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/fcgi/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/  
endef  
 
define Package/fcgixx/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi++.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,fcgi))  
$(eval $(call BuildPackage,fcgixx))  
 
Index: fcgi-2.4.0/include/fcgio.h  
===================================================================  
--- fcgi-2.4.0.orig/include/fcgio.h 2007-07-17 13:30:28.000000000 +0200  
+++ fcgi-2.4.0/include/fcgio.h 2007-07-17 13:30:28.000000000 +0200  
@@ -77,10 +77,10 @@  
virtual int sync();  
 
// Remove and return the current character.  
- virtual int uflow();  
+ virtual int_type uflow();  
 
// Fill the get area (if buffered) and return the current character.  
- virtual int underflow();  
+ virtual int_type underflow();  
 
// Use a buffer. The only reasons that a buffer would be useful is  
// to support the use of the unget()/putback() or seek() methods. Using  
diff -urN fcgi-2.4.0/libfcgi/fcgio.cpp fcgi-2.4.0.new/libfcgi/fcgio.cpp  
--- fcgi-2.4.0/libfcgi/fcgio.cpp 2002-02-24 21:12:22.000000000 +0100  
+++ fcgi-2.4.0.new/libfcgi/fcgio.cpp 2007-08-28 11:22:22.000000000 +0200  
@@ -89,7 +89,7 @@  
}  
 
// uflow() removes the char, underflow() doesn't  
-int fcgi_streambuf::uflow()  
+short int fcgi_streambuf::uflow()  
{  
int rv = underflow();  
if (this->bufsize) gbump(1);  
@@ -97,7 +97,7 @@  
}  
 
// Note that the expected behaviour when there is no buffer varies  
-int fcgi_streambuf::underflow()  
+short int fcgi_streambuf::underflow()  
{  
if (this->bufsize)  
{  
 
diff -urN fcgi-2.4.0/Makefile.am fcgi-2.4.0.new/Makefile.am  
--- fcgi-2.4.0/Makefile.am 2001-12-22 14:05:39.000000000 +0100  
+++ fcgi-2.4.0.new/Makefile.am 2007-08-28 11:05:10.000000000 +0200  
@@ -4,7 +4,7 @@  
# $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $  
#  
 
-SUBDIRS = libfcgi cgi-fcgi examples include  
+SUBDIRS = libfcgi cgi-fcgi include  
 
include_HEADERS = fcgi_config.h  
 
diff -urN fcgi-2.4.0/Makefile.in fcgi-2.4.0.new/Makefile.in  
--- fcgi-2.4.0/Makefile.in 2003-01-19 18:21:15.000000000 +0100  
+++ fcgi-2.4.0.new/Makefile.in 2007-08-28 11:04:55.000000000 +0200  
@@ -93,7 +93,7 @@  
am__quote = @am__quote@  
install_sh = @install_sh@  
 
-SUBDIRS = libfcgi cgi-fcgi examples include  
+SUBDIRS = libfcgi cgi-fcgi include  
 
include_HEADERS = fcgi_config.h  
 
 
file:a/libs/gdbm/Makefile (deleted)
#  
# 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:=gdbm  
PKG_VERSION:=1.10  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=@GNU/gdbm  
PKG_MD5SUM:=88770493c2559dc80b561293e39d3570  
 
PKG_LICENSE:=GPLv3  
PKG_LICENSE_FILES:=COPYING  
 
PKG_FIXUP:=autoreconf  
PKG_BUILD_PARALLEL:=0  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/libgdbm  
SECTION:=libs  
CATEGORY:=Libraries  
TITLE:=GNU database manager  
URL:=http://www.gnu.org/software/gdbm/  
endef  
 
TARGET_CFLAGS += $(FPIC)  
 
CONFIGURE_ARGS += \  
--enable-shared \  
--enable-static \  
 
define Build/Compile  
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \  
BINOWN=`id -u` \  
BINGRP=`id -g` \  
DESTDIR="$(PKG_INSTALL_DIR)" \  
all install  
endef  
 
define Build/InstallDev  
$(INSTALL_DIR) $(1)/usr/include  
$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/  
endef  
 
define Package/libgdbm/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libgdbm))  
 
file:a/libs/libsrtp/Makefile (deleted)
#  
# Copyright (C) 2011-2012 OpenWrt.org  
# Copyright (C) 2011 Victor Seva <linuxmaniac@torreviejawireless.org>  
#  
# 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 <linuxmaniac@torreviejawireless.com>  
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))  
 
Description: Fix MIPS namespace collision  
Author: Thiemo Seufer <ths@networkno.de>  
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 );  
}  
 
 
Description: Fix data alignment  
Author: "Martin Guy" <martinwguy@yahoo.it>  
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,  
 
Description: Update Doxyfile and header template  
Author: Jonas Smedegaard <dr@jones.dk>  
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}  
 
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;  
 
file:a/libs/libssh2/Makefile (deleted)
#  
# 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.3  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz  
PKG_SOURCE_URL:=http://www.libssh2.org/download  
PKG_MD5SUM:=071004c60c5d6f90354ad1b701013a0b  
 
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  
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig  
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libssh2.pc $(1)/usr/lib/pkgconfig/  
endef  
 
define Package/libssh2/install  
$(INSTALL_DIR) $(1)/usr/lib  
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libssh2.so* $(1)/usr/lib/  
endef  
 
$(eval $(call BuildPackage,libssh2))  
 
#  
# 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))  
 
file:a/libs/unixodbc/Makefile (deleted)
#  
# 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))  
 
@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  
 
file:a/net/apache/Makefile (deleted)
#  
# 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))  
 
--- 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  
 
 
--- /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  
+};  
 
--- a/build/mkconfNW.awk  
+++ b/build/mkconfNW.awk  
@@ -24,7 +24,7 @@ BEGIN {  
A["sysconfdir"] = "conf"  
A["iconsdir"] = "icons"  
A["manualdir"] = "manual"  
- A["runtimedir"] = "logs"  
+ A["runtimedir"] = "log"  
A["errordir"] = "error"  
A["proxycachedir"] = "proxy"  
 
--- a/config.layout  
+++ b/config.layout  
@@ -28,8 +28,8 @@  
cgidir: ${datadir}/cgi-bin  
includedir: ${prefix}/include  
localstatedir: ${prefix}  
- runtimedir: ${localstatedir}/logs  
- logfiledir: ${localstatedir}/logs  
+ runtimedir: ${localstatedir}/log  
+ logfiledir: ${localstatedir}/log  
proxycachedir: ${localstatedir}/proxy  
</Layout>  
 
@@ -150,7 +150,7 @@  
includedir: ${prefix}/include  
localstatedir: /var${prefix}  
runtimedir: ${localstatedir}/run  
- logfiledir: ${localstatedir}/logs  
+ logfiledir: ${localstatedir}/log  
proxycachedir: ${localstatedir}/proxy  
</Layout>  
 
 
--- 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 ---  
 
--- a/docs/conf/httpd.conf.in  
+++ b/docs/conf/httpd.conf.in  
@@ -51,7 +51,6 @@ Listen @@Port@@  
# Example:  
# LoadModule foo_module modules/mod_foo.so  
#  
-@@LoadModule@@  
 
<IfModule !mpm_netware_module>  
<IfModule !mpm_winnt_module>  
@@ -63,8 +62,8 @@ Listen @@Port@@  
# It is usually good practice to create a dedicated user and group for  
# running httpd, as with most system services.  
#  
-User daemon  
-Group daemon  
+User nobody  
+Group nogroup  
 
</IfModule>  
</IfModule>  
@@ -191,7 +190,7 @@ ErrorLog "@rel_logfiledir@/error_log"  
# Possible values include: debug, info, notice, warn, error, crit,  
# alert, emerg.  
#  
-LogLevel warn  
+LogLevel debug  
 
<IfModule log_config_module>  
#  
@@ -336,7 +335,7 @@ DefaultType text/plain  
# contents of the file itself to determine its type. The MIMEMagicFile  
# directive tells the module where the hint definitions are located.  
#  
-#MIMEMagicFile @rel_sysconfdir@/magic  
+MIMEMagicFile @rel_sysconfdir@/magic  
 
#  
# Customizable error responses come in three flavors:  
@@ -358,7 +357,7 @@ DefaultType text/plain  
# broken on your system.  
#  
#EnableMMAP off  
-#EnableSendfile off  
+EnableSendfile off  
 
# Supplemental configuration  
#  
@@ -404,7 +403,7 @@ DefaultType text/plain  
# starting without SSL on platforms with no /dev/random equivalent  
# but a statically compiled-in mod_ssl.  
#  
-<IfModule ssl_module>  
-SSLRandomSeed startup builtin  
-SSLRandomSeed connect builtin  
-</IfModule>  
+#<IfModule ssl_module>  
+#SSLRandomSeed startup builtin  
+#SSLRandomSeed connect builtin  
+#</IfModule>  
 
#  
# Copyright (C) 2009-2014 OpenWrt.org  
#  
# This is free software, licensed under the GNU General Public License v2.  
# See /LICENSE for more information.  
#  
 
include $(TOPDIR)/rules.mk  
 
PKG_NAME:=transmission  
PKG_VERSION:=2.83  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files  
PKG_MD5SUM:=4620cfbfefee2ce55a6fa12c3ec330a7  
 
PKG_FIXUP:=autoreconf  
PKG_INSTALL:=1  
PKG_BUILD_PARALLEL:=1  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/transmission/template  
SUBMENU:=BitTorrent  
SECTION:=net  
CATEGORY:=Network  
TITLE:=A free, lightweight BitTorrent client  
URL:=http://www.transmissionbt.com  
MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>  
endef  
 
define Package/transmission-daemon  
$(call Package/transmission/template)  
DEPENDS:=+libcurl +libopenssl +libpthread +libevent2 +librt  
MENU:=1  
endef  
 
define Package/transmission-cli  
$(call Package/transmission/template)  
DEPENDS:=transmission-daemon  
endef  
 
define Package/transmission-remote  
$(call Package/transmission/template)  
DEPENDS:=+libcurl +libopenssl +libpthread +libevent2 +librt  
endef  
 
define Package/transmission-web  
$(call Package/transmission/template)  
DEPENDS:=transmission-daemon  
endef  
 
 
define Package/transmission-daemon/description  
Transmission is a simple BitTorrent client.  
It features a very simple, intuitive interface  
on top on an efficient, cross-platform back-end.  
This package contains the daemon itself.  
endef  
 
define Package/transmission-cli/description  
CLI utilities for transmission.  
endef  
 
define Package/transmission-remote/description  
CLI remote interface for transmission.  
endef  
 
define Package/transmission-web/description  
Webinterface resources for transmission.  
endef  
 
define Package/transmission-daemon/conffiles  
/etc/config/transmission  
endef  
 
CONFIGURE_VARS += \  
LIBEVENT_LIBS="$(STAGING_DIR)/usr/lib/libevent-2.0.so.5"  
 
CONFIGURE_ARGS += \  
--enable-daemon \  
--enable-cli \  
--without-gtk \  
--enable-largefile \  
--enable-lightweight  
 
MAKE_FLAGS += \  
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"  
 
define Package/transmission-daemon/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/  
$(INSTALL_DIR) $(1)/etc/init.d/  
$(INSTALL_BIN) files/transmission.init $(1)/etc/init.d/transmission  
$(INSTALL_DIR) $(1)/etc/config  
$(INSTALL_CONF) files/transmission.config $(1)/etc/config/transmission  
endef  
 
define Package/transmission-cli/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-cli \  
$(PKG_INSTALL_DIR)/usr/bin/transmission-create \  
$(PKG_INSTALL_DIR)/usr/bin/transmission-edit \  
$(PKG_INSTALL_DIR)/usr/bin/transmission-show \  
$(1)/usr/bin/  
endef  
 
define Package/transmission-remote/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/  
endef  
 
define Package/transmission-web/install  
$(INSTALL_DIR) $(1)/usr/share/transmission  
$(CP) $(PKG_INSTALL_DIR)/usr/share/transmission/web $(1)/usr/share/transmission/  
endef  
 
$(eval $(call BuildPackage,transmission-daemon))  
$(eval $(call BuildPackage,transmission-cli))  
$(eval $(call BuildPackage,transmission-remote))  
$(eval $(call BuildPackage,transmission-web))  
 
config transmission  
option enabled 0  
option config_dir '/tmp/transmission'  
#option user 'nobody'  
option alt_speed_down 50  
option alt_speed_enabled false  
option alt_speed_time_begin 540  
option alt_speed_time_day 127  
option alt_speed_time_enabled false  
option alt_speed_time_end 1020  
option alt_speed_up 50  
option bind_address_ipv4 '0.0.0.0'  
option bind_address_ipv6 '::'  
option blocklist_enabled false  
option blocklist_url ''  
option cache_size_mb 2  
option dht_enabled true  
option download_dir '/tmp/transmission/done'  
option download_queue_enabled true  
option download_queue_size 4  
option encryption 1  
option idle_seeding_limit 30  
option idle_seeding_limit_enabled false  
option incomplete_dir '/tmp/transmission/incomplete'  
option incomplete_dir_enabled false  
option lazy_bitfield_enabled true  
option lpd_enabled false  
option message_level 1  
option peer_congestion_algorithm ''  
option peer_limit_global 240  
option peer_limit_per_torrent 60  
option peer_port 51413  
option peer_port_random_high 65535  
option peer_port_random_low 49152  
option peer_port_random_on_start false  
option peer_socket_tos 'default'  
option pex_enabled true  
option port_forwarding_enabled true  
option preallocation 1  
option prefetch_enabled true  
option queue_stalled_enabled true  
option queue_stalled_minutes 30  
option ratio_limit 2.0000  
option ratio_limit_enabled false  
option rename_partial_files true  
option rpc_authentication_required false  
option rpc_bind_address '0.0.0.0'  
option rpc_enabled true  
option rpc_password ''  
option rpc_port 9091  
option rpc_url '/transmission/'  
option rpc_username ''  
option rpc_whitelist '127.0.0.1,192.168.1.*'  
option rpc_whitelist_enabled true  
option scrape_paused_torrents_enabled true  
option script_torrent_done_enabled false  
option script_torrent_done_filename ''  
option seed_queue_enabled false  
option seed_queue_size 10  
option speed_limit_down 100  
option speed_limit_down_enabled false  
option speed_limit_up 20  
option speed_limit_up_enabled false  
option start_added_torrents true  
option trash_original_torrent_files false  
option umask 18  
option upload_slots_per_torrent 14  
option utp_enabled true  
option scrape_paused_torrents true  
option watch_dir_enabled false  
option watch_dir ''  
 
#!/bin/sh /etc/rc.common  
# Copyright (C) 2010-2012 OpenWrt.org  
 
START=99  
 
LIST_SEP="  
"  
 
append_params() {  
local p; local v; local s="$1"; shift  
for p in $*; do  
config_get v "$s" "$p"  
IFS="$LIST_SEP"  
for v in $v; do  
[ -n "$v" ] && (  
echo "\""$p"\": "$v"," | sed -e 's|_|-|g' >> $config_file  
)  
done  
unset IFS  
done  
}  
 
append_params_quotes() {  
local p; local v; local s="$1"; shift  
for p in $*; do  
config_get v "$s" "$p"  
IFS="$LIST_SEP"  
for v in $v; do  
[ -n "$v" ] && (  
echo -n "\""$p | sed -e 's|/|\\/|g;s|_|-|g' >> $config_file; \  
echo "\": \""$v"\"," >> $config_file  
)  
done  
unset IFS  
done  
}  
 
section_enabled() {  
config_get_bool enabled "$1" 'enabled' 0  
[ $enabled -gt 0 ]  
}  
 
start_instance() {  
local s="$1"  
local user  
 
section_enabled "$section" || return 1  
 
config_get config_dir "$s" 'config_dir' '/var/etc/transmission'  
config_get user "$s" 'user'  
 
config_file="$config_dir/settings.json"  
[ -d $config_dir ] || {  
mkdir -m 0755 -p "$config_dir"  
touch $config_file  
[ -z "$user" ] || chown -R $user $config_dir  
}  
 
echo "{" > $config_file  
 
append_params "$s" \  
alt_speed_down alt_speed_enabled alt_speed_time_begin alt_speed_time_day \  
alt_speed_time_enabled alt_speed_time_end alt_speed_up blocklist_enabled \  
cache_size_mb download_queue_enabled download_queue_size \  
dht_enabled encryption idle_seeding_limit idle_seeding_limit_enabled \  
incomplete_dir_enabled lazy_bitfield_enabled lpd_enabled message_level \  
peer_limit_global peer_limit_per_torrent peer_port \  
peer_port_random_high peer_port_random_low peer_port_random_on_start \  
pex_enabled port_forwarding_enabled preallocation prefetch_enabled \  
ratio_limit ratio_limit_enabled rename_partial_files rpc_authentication_required \  
rpc_enabled rpc_port rpc_whitelist_enabled queue_stalled_enabled \  
queue_stalled_minutes scrape_paused_torrents_enabled script_torrent_done_enabled \  
seed_queue_enabled seed_queue_size \  
speed_limit_down speed_limit_down_enabled speed_limit_up \  
speed_limit_up_enabled start_added_torrents trash_original_torrent_files \  
umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \  
watch_dir_enabled  
 
append_params_quotes "$s" \  
blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \  
peer_congestion_algorithm peer_socket_tos rpc_bind_address rpc_password rpc_url \  
rpc_username rpc_whitelist script_torrent_done_filename watch_dir  
 
echo "\""invalid-key"\": false" >> $config_file  
echo "}" >> $config_file  
 
SERVICE_UID="$user" \  
service_start /usr/bin/transmission-daemon -g $config_dir  
}  
 
stop_instance() {  
local s="$1"  
local user  
 
section_enabled "$section" || return 1  
 
config_get user "$s" 'user'  
 
SERVICE_UID="$user" \  
service_stop /usr/bin/transmission-daemon  
}  
 
start() {  
config_load 'transmission'  
config_foreach start_instance 'transmission'  
}  
 
stop() {  
config_load 'transmission'  
config_foreach stop_instance 'transmission'  
}  
 
--- a/libtransmission/fdlimit.c  
+++ b/libtransmission/fdlimit.c  
@@ -25,7 +25,8 @@  
#include <fcntl.h>  
#endif  
 
-#ifdef HAVE_FALLOCATE64  
+/* no need to define fallocate64 in glibc/eglibc case */  
+#if defined(__UCLIBC__) && (HAVE_FALLOCATE64)  
/* FIXME can't find the right #include voodoo to pick up the declaration.. */  
extern int fallocate64 (int fd, int mode, uint64_t offset, uint64_t len);  
#endif  
 
--- a/configure.ac  
+++ b/configure.ac  
@@ -251,7 +251,7 @@  
AC_LINK_IFELSE(  
[AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>],  
[struct UPNPDev dev;])],  
- [upnp_version="unknown"],  
+ [upnp_version="none"],  
[upnp_version="none"]  
)  
 
 
file:a/net/wget/Makefile (deleted)
#  
# 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:=wget  
PKG_VERSION:=1.15  
PKG_RELEASE:=1  
 
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz  
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)  
PKG_MD5SUM:=7a279d5ac5594919124d5526e7143e28  
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)  
 
include $(INCLUDE_DIR)/package.mk  
 
define Package/wget/Default  
SECTION:=net  
CATEGORY:=Network  
DEPENDS:=+libpcre  
SUBMENU:=File Transfer  
TITLE:=Non-interactive network downloader  
URL:=http://www.gnu.org/software/wget/index.html  
endef  
 
define Package/wget/Default/description  
Wget is a network utility to retrieve files from the Web using http  
and ftp, the two most widely used Internet protocols. It works  
non-interactively, so it will work in the background, after having  
logged off. The program supports recursive retrieval of web-authoring  
pages as well as ftp sites -- you can use wget to make mirrors of  
archives and home pages or to travel the Web like a WWW robot.  
endef  
 
define Package/wget  
$(call Package/wget/Default)  
DEPENDS+= +libopenssl +librt  
TITLE+= (with SSL support)  
VARIANT:=ssl  
endef  
 
define Package/wget/description  
$(call Package/wget/Default/description)  
This package is built with SSL support.  
endef  
 
define Package/wget-nossl  
$(call Package/wget/Default)  
TITLE+= (without SSL support)  
DEPENDS+= +zlib  
VARIANT:=nossl  
endef  
 
define Package/wget-nossl/description  
$(call Package/wget/Default/description)  
This package is built without SSL support.  
endef  
 
CONFIGURE_ARGS+= \  
--disable-rpath \  
--disable-iri  
 
CONFIGURE_VARS += \  
ac_cv_header_uuid_uuid_h=no  
 
ifeq ($(BUILD_VARIANT),ssl)  
CONFIGURE_ARGS+= \  
--with-ssl=openssl \  
--with-libssl-prefix="$(STAGING_DIR)/usr"  
endif  
 
ifeq ($(BUILD_VARIANT),nossl)  
CONFIGURE_ARGS+= \  
--disable-ntlm \  
--without-ssl  
endif  
 
define Package/wget/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl  
endef  
 
define Package/wget-nossl/install  
$(INSTALL_DIR) $(1)/usr/bin  
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl  
endef  
 
define Package/wget/postinst  
#!/bin/sh  
if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then  
rm -rf $${IPKG_INSTROOT}/usr/bin/wget;  
fi  
ln -sf ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget  
endef  
 
define Package/wget/postrm  
#!/bin/sh  
rm $${IPKG_INSTROOT}/usr/bin/wget  
[ -x $${IPKG_INSTROOT}/usr/bin/wget-nossl ] && ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget || {  
ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget  
$${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget  
}  
exit 0  
endef  
 
define Package/wget-nossl/postinst  
#!/bin/sh  
if [ -e $${IPKG_INSTROOT}/usr/bin/wget ]; then  
rm -rf $${IPKG_INSTROOT}/usr/bin/wget;  
fi  
ln -s ./wget-nossl $${IPKG_INSTROOT}/usr/bin/wget  
endef  
 
define Package/wget-nossl/postrm  
#!/bin/sh  
rm $${IPKG_INSTROOT}/usr/bin/wget  
[ -x $${IPKG_INSTROOT}/usr/bin/wget-ssl ] && ln -s ./wget-ssl $${IPKG_INSTROOT}/usr/bin/wget || {  
ln -s ../../bin/busybox $${IPKG_INSTROOT}/usr/bin/wget  
$${IPKG_INSTROOT}/usr/bin/wget 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/usr/bin/wget  
}  
exit 0  
endef  
 
$(eval $(call BuildPackage,wget))  
$(eval $(call BuildPackage,wget-nossl))  
 
comments