diff options
36 files changed, 971 insertions, 34 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 876975b875..8b34c89d64 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -81,11 +81,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -# Libc/uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libiconv ?= glibc -PREFERRED_PROVIDER_virtual/libintl ?= glibc - # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc new file mode 100644 index 0000000000..61d14407c8 --- /dev/null +++ b/conf/distro/include/angstrom-glibc.inc @@ -0,0 +1,13 @@ +# glibc: +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" + +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" +CXXFLAGS += "-fvisibility-inlines-hidden" + diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc new file mode 100644 index 0000000000..ee37921af5 --- /dev/null +++ b/conf/distro/include/angstrom-uclibc.inc @@ -0,0 +1,13 @@ +# uclibc: +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "libintl" + +TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" +CXXFLAGS += "-fvisibility-inlines-hidden" + diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 7d125ae25b..ba5687615d 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -5,6 +5,13 @@ DISTRO = "angstrom" DISTRO_NAME = "Angstrom" +TARGET_VENDOR = "-angstrom" + +# Can be "glibc" and "uclibc" +ANGSTROM_MODE ?= "glibc" + +require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc + #Use this variable in feeds and other parts that need a URI ANGSTROM_URI = "http://www.angstrom-distribution.org" @@ -19,21 +26,6 @@ INHERIT += "package_ipk debian multimachine" PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -#if you want to build using uclibc, specify "-uclibcgnueabi" -TARGET_VENDOR = "-angstrom" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -#uclibc (needs gcc 4.1.1 or newer) -#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" -CXXFLAGS += "-fvisibility-inlines-hidden" - #ARM EABI is softfloat by default, but let's make sure :) #make it overridable for platforms with FPU, like ep93xx or i.mx31 TARGET_FPU_arm ?= "soft" diff --git a/packages/clamav/.mtn2git_empty b/packages/clamav/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clamav/.mtn2git_empty diff --git a/packages/clamav/clamav_0.88.4.bb b/packages/clamav/clamav_0.88.4.bb new file mode 100644 index 0000000000..8e51551861 --- /dev/null +++ b/packages/clamav/clamav_0.88.4.bb @@ -0,0 +1,100 @@ +DESCRIPTION = "Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main \ +purpose of this software is the integration with mail servers (attachment \ +scanning)." +DESCRIPTION_${PN}-lib = "The dynamic library that is shared between all of \ +the Clam AntiVirus components" +DESCRIPTION_${PN}-freshclam = "An automatic virus signature update \ +application for Clam AntiVirus" +DESCRIPTION_${PN}-data = "Static anti virus signature database for Clam AntiVirus" +DESCRIPTION_${PN}-daemon = "A on-demand file scanning service for Clam AntiVirus" +HOMEPAGE = "http://www.clamav.net/" +SECTION = "network" +MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" +LICENSE = "GPL" +DEPENDS = "zlib bzip2 gmp" +RDEPENDS_${PN} = "${PN}-data" +RDEPENDS_${PN}-daemon = "${PN}-data" +RRECOMMENDS_${PN} = "${PN}-freshclam" +RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" + +SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz \ + file://cross-compile-fix.patch;patch=1 \ + file://libtool-fix.patch;patch=1 \ + file://clamav-daemon.init \ + file://clamav-freshclam.init \ + file://clamav-daemon.default \ + file://clamd.conf \ + file://freshclam.conf" + +inherit autotools update-rc.d + +# Don't check for clamav uid/gid - they don't exist on the host +# Put virus definitions in /var/lib not /usr/lib +EXTRA_OECONF = "--disable-clamav \ + --with-dbdir=${localstatedir}/lib/clamav" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d \ + ${D}${docdir}/clamav + # Save the installed clamd.conf in the doc dir and then install out new one + install -m 0755 ${D}${sysconfdir}/clamd.conf ${D}${docdir}/clamav/clamd.conf.example + install -m 0755 ${WORKDIR}/clamd.conf ${D}${sysconfdir}/clamd.conf + # Save the installed freshclam.conf in the doc dir and then install out new one + install -m 0755 ${D}${sysconfdir}/freshclam.conf ${D}${docdir}/clamav/freshclam.conf.example + # Install our config files and init scripts + install -m 0755 ${WORKDIR}/freshclam.conf ${D}${sysconfdir}/freshclam.conf + install -m 0755 ${WORKDIR}/clamav-daemon.default ${D}${sysconfdir}/default/clamav-daemon + install -m 0755 ${WORKDIR}/clamav-daemon.init ${D}${sysconfdir}/init.d/clamav-daemon + install -m 0755 ${WORKDIR}/clamav-freshclam.init ${D}${sysconfdir}/init.d/clamav-freshclam +} + +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib" + +FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan" +FILES_${PN}-lib = "${libdir}/libclamav.so.*" +FILES_${PN}-freshclam = "${bindir}/freshclam \ + ${sysconfdir}/freshclam.conf \ + ${sysconfdir}/init.d/clamav-freshclam" +FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ + ${sbindir}/clamd \ + ${sysconfdir}/init.d/clamav-daemon \ + ${sysconfdir}/default/clamav-daemon" +FILES_${PN}-data = "${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd" +FILES_${PN}-dev += "${bindir}/clamav-config" + +# Add clamav's user and groups +pkg_postinst_${PN}-freshclam () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || adduser --disabled-password --home=/var/lib/clamav/ \ + --ingroup clamav -g "ClamAV" clamav +} +pkg_postinst_${PN}-daemon () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || adduser --disabled-password --home=/var/lib/clamav/ \ + --ingroup clamav -g "ClamAV" clamav +} +pkg_postinst_${PN}-data () { + grep -q clamav: /etc/group || addgroup clamav + grep -q clamav: /etc/passwd || adduser --disabled-password --home=/var/lib/clamav/ \ + --ingroup clamav --no-create-home -g "ClamAV" clamav + chown clamav:clamav \ + ${localstatedir}/lib/clamav \ + ${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd +} + +# Indicate that the default files are configuration files +CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ + ${sysconfdir}/default/clamav-daemon" +CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf" +# Make the database as conffiles so that newwer data file won't replace +# updates generated by freshclam +CONFFILES_${PN}-data = "${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd" + +INITSCRIPT_PACKAGES = "${PN}-daemon ${PN}-freshclam" +INITSCRIPT_NAME_${PN}-daemon = "clamav-daemon" +INITSCRIPT_NAME_${PN}-freshclam = "clamav-freshclam" +INITSCRIPT_PARAMS_${PN}-daemon = "defaults 50 50" +INITSCRIPT_PARAMS_${PN}-freshclam = "defaults 50 50" diff --git a/packages/clamav/files/.mtn2git_empty b/packages/clamav/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clamav/files/.mtn2git_empty diff --git a/packages/clamav/files/clamav-daemon.default b/packages/clamav/files/clamav-daemon.default new file mode 100644 index 0000000000..bc19984183 --- /dev/null +++ b/packages/clamav/files/clamav-daemon.default @@ -0,0 +1 @@ +# Options for clamav-daemon (clamd process) diff --git a/packages/clamav/files/clamav-daemon.init b/packages/clamav/files/clamav-daemon.init new file mode 100644 index 0000000000..a70e14f3f4 --- /dev/null +++ b/packages/clamav/files/clamav-daemon.init @@ -0,0 +1,75 @@ +#! /bin/sh +# This is a modified version of the debian clamav-daemon init script +set -e +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/clamd +NAME="clamd" +DESC="ClamAV daemon" +CLAMAVCONF=/etc/clamd.conf + +[ -x "$DAEMON" ] || exit 0 +[ -r /etc/default/clamav-daemon ] && . /etc/default/clamav-daemon + +if [ ! -f "$CLAMAVCONF" ]; then + echo "There is no configuration file for $DESC." + exit 0; +fi +if grep -q "^Example" $CLAMAVCONF; then + echo "$DESC is not configured. Please edit $CLAMAVCONF" + exit 0 +fi + +THEPIDFILE="`grep ^PidFile $CLAMAVCONF | awk '{print $2}'`" +[ -e "$THEPIDFILE" ] && PID=`cat $THEPIDFILE` +[ "$PID" = '1' ] && unset PID + +# Make sure dirs exist and are correct +for i in /var/run/clamav /var/log/clamav /var/lib/clamav +do + [ ! -d $i ] && mkdir -p $i && chown clamav:clamav $i +done + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --oknodo -S -x $DAEMON + echo "$NAME" + ;; + + stop) + echo -n "Stopping $DESC: " + if [ -n "$PID" ]; then + kill -15 -"$PID" + sleep 1 + if kill -0 "$PID" 2>/dev/null; then + echo -n "Waiting . " + cnt=0 + while kill -0 "$PID" 2>/dev/null; do + cnt=`expr "$cnt" + 1` + if [ "$cnt" -gt 60 ]; then + echo -n " Failed.. " + kill -9 -"$PID" + break + fi + sleep 2 + echo -n ". " + done + fi + else + start-stop-daemon -o -K -q -p $THEPIDFILE + fi + echo "$NAME" + ;; + + restart|force-reload) + $0 stop + $0 start + ;; + + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/clamav/files/clamav-freshclam.init b/packages/clamav/files/clamav-freshclam.init new file mode 100644 index 0000000000..47491a2a54 --- /dev/null +++ b/packages/clamav/files/clamav-freshclam.init @@ -0,0 +1,145 @@ +#!/bin/sh +# This is a modified version of the debian clamav-freshclam init script +set -e +DAEMON=/usr/bin/freshclam +NAME=freshclam +DESC="ClamAV virus database updater" + +[ -x $DAEMON ] || exit 0 + +CLAMAV_CONF_FILE=/etc/clamd.conf +FRESHCLAM_CONF_FILE=/etc/freshclam.conf +PIDFILE=/var/run/clamav/freshclam.pid + +slurp_config() +{ + CLAMAVCONF="$1" + + if [ -e "$CLAMAVCONF" ]; then + for variable in `egrep -v '^[[:space:]]*(#|$)' "$CLAMAVCONF" | awk '{print $1}'`; do + if [ "$variable" = 'DatabaseMirror' ]; then + if [ -z "$DatabaseMirror" ]; then + for i in `grep ^$variable $CLAMAVCONF | awk '{print $2}'`; do + value="$i $value" + done + else + continue + fi + elif [ "$variable" = 'VirusEvent' -o "$variable" = 'OnUpdateExecute' -o "$variable" = 'OnErrorExecute' ]; then + value=`grep ^$variable $CLAMAVCONF | head -n1 | sed -e s/$variable\ //` + else + value=`grep ^$variable $CLAMAVCONF | head -n1 | awk '{print $2}'` + fi + if ! [ "$value" = "$variable" -o "$value" = "" ]; then + export "$variable"="$value" + else + export "$variable"="true" + fi + unset value + done + fi +} + + +slurp_config "$FRESHCLAM_CONF_FILE" + +for inet in $INTERFACE; do + if route | grep -q "$inet"; then + IS_UP=true + break + else + IS_UP=false + fi +done +for inet in $INTERFACE; do + if [ "$inet" = "$IFACE" ]; then + match=true + break + else + match=false + fi +done + +# We don't want to always start/stop if running from if-up/down.d +if ! [ "$1" = "start" -o "$1" = "stop" ]; then # Exempt restart/reload/etc from checks + if [ -n "$INTERFACE" ]; then # Want it only run from if-up.d + if [ -z "$IFACE" ]; then # Is not called by if-up.d + if [ "$IS_UP" = false ]; then # And route isn't up (e.g., upgrade) + echo "Interface not up. Exiting." + exit 0 + fi + elif [ "$match" != 'true' ]; then # IFACE coming up is not the one selected + echo "Interface not up. Exiting." + exit 0 + fi + fi +fi + +# If user wants it run from cron, we only accept no-daemon and stop +if [ -f /etc/cron.d/clamav-freshclam ]; then + if ! [ "$1" = "no-daemon" -o "$1" = "stop" ]; then + echo "Cron option has been selected for running freshclam" + echo "Please either run freshclam directly, or run the init" + echo "script with the 'no-daemon' option" + exit 0 + fi +fi + +[ -z "$UpdateLogFile" ] && UpdateLogFile=/var/log/clamav/freshclam.log + +if [ -z "$DatabaseDirectory" ]; then + [ -r "$CLAMAV_CONF_FILE" ] && DatabaseDirectory=$(grep 'DataDirectory' "$CLAMAV_CONF_FILE" | awk '{print $2}') + [ -z "$DatabaseDirectory" ] && DatabaseDirectory=/var/lib/clamav/ +fi + +[ -e "$PIDFILE" ] && PID=`cat $PIDFILE` +[ "$PID" = '1' ] && unset PID + +# Make sure dirs exist and are correct +for i in /var/run/clamav /var/log/clamav $DatabaseDirectory +do + [ ! -d $i ] && mkdir -p $i && chown clamav:clamav $i +done + +case "$1" in + no-daemon) + echo "It takes freshclam ~3min to timeout and try the next mirror in the list" + freshclam -l "$UpdateLogFile" --datadir "$DatabaseDirectory" + ;; + start) + echo -n "Starting $DESC: " + start-stop-daemon -S -x $DAEMON -- -d --quiet -p $PIDFILE + echo "$NAME" + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -o -K -q -p $PIDFILE $DAEMON + if [ -n "$PID" ]; then + sleep 1 + if kill -0 "$PID" 2>/dev/null; then + echo -n "Waiting . " + cnt=0 + while kill -0 "$PID" 2>/dev/null; do + cnt=`expr "$cnt" + 1` + if [ "$cnt" -gt 60 ]; then + echo -n " Failed.. " + break + fi + sleep 2 + echo -n ". " + done + fi + fi + echo "$NAME" + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {no-daemon|start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/clamav/files/clamd.conf b/packages/clamav/files/clamd.conf new file mode 100644 index 0000000000..485c80d420 --- /dev/null +++ b/packages/clamav/files/clamd.conf @@ -0,0 +1,25 @@ +## Please read the clamd.conf(5) manual before editing this file. +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket +User clamav +AllowSupplementaryGroups +ScanMail +ScanArchive +ArchiveMaxRecursion 5 +ArchiveMaxFiles 1000 +ArchiveMaxFileSize 10M +ArchiveMaxCompressionRatio 250 +ReadTimeout 180 +MaxThreads 12 +MaxConnectionQueueLength 15 +LogFile /var/log/clamav/clamav.log +LogTime +LogFileMaxSize 0 +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +SelfCheck 3600 +ScanOLE2 +ScanPE +DetectBrokenExecutables +ScanHTML +ArchiveBlockMax diff --git a/packages/clamav/files/cross-compile-fix.patch b/packages/clamav/files/cross-compile-fix.patch new file mode 100644 index 0000000000..690d680c66 --- /dev/null +++ b/packages/clamav/files/cross-compile-fix.patch @@ -0,0 +1,74 @@ +Add some caching of values which can't be determined when +cross-compiling. This lets us define the values via the site files. + +--- clamav-0.88.4/configure.in 2006/09/12 05:49:09 1.1 ++++ clamav-0.88.4/configure.in 2006/09/12 06:24:27 +@@ -56,19 +56,18 @@ + + dnl Check for broken snprintf (code by Phil Oleson <oz*nixil.net>) + if test "x$ac_cv_func_snprintf" = "xyes" ; then +- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) +- AC_TRY_RUN( +- [ ++ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], ++ [clamav_av_func_working_snprintf_long], [ ++ AC_TRY_RUN( ++ [ + #include <stdio.h> + int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');} +- ], +- [AC_MSG_RESULT(yes)], +- [ +- AC_MSG_RESULT(no) +- AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) +- AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) +- ] +- ) ++ ]) ++ ]) ++ if test "x$clamav_av_func_working_snprintf_long" = "xno"; then ++ AC_DEFINE(BROKEN_SNPRINTF,1,[Define if your snprintf is busted]) ++ AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor]) ++ fi + fi + + have_pthreads=no +@@ -331,18 +330,28 @@ + AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) + + dnl check for in_port_t definition +-AC_TRY_RUN([ +-#include <sys/types.h> +-#include <netinet/in.h> +-int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined)) ++AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ ++ AC_TRY_RUN([ ++ #include <sys/types.h> ++ #include <netinet/in.h> ++ int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; } ++ ]) ++ ]) ++if test "$clamav_av_have_in_port_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]) ++fi + + dnl check for in_addr_t definition +-AC_TRY_RUN([ +-#include <sys/types.h> +-#include <netinet/in.h> +-int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } +-], AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]), AC_MSG_RESULT(in_addr_t is not defined)) ++AC_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ ++ AC_TRY_RUN([ ++ #include <sys/types.h> ++ #include <netinet/in.h> ++ int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; } ++ ]) ++ ]) ++if test "$clamav_av_have_in_addr_t" = "yes"; then ++ AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined]) ++fi + + case "$target_os" in + linux*) diff --git a/packages/clamav/files/freshclam.conf b/packages/clamav/files/freshclam.conf new file mode 100644 index 0000000000..770490b3ab --- /dev/null +++ b/packages/clamav/files/freshclam.conf @@ -0,0 +1,19 @@ +## Please read the freshclam.conf(5) manual before editing this file. + +# Comment or remove the line below. +Example + +# Uncomment the following line and replace XY with your country +# code. See http://www.iana.org/cctld/cctld-whois.htm for the full list. +# Default: There is no default, which results in an error when running freshclam +#DatabaseMirror db.XY.clamav.net + +DatabaseMirror database.clamav.net +DatabaseOwner clamav +UpdateLogFile /var/log/clamav/freshclam.log +LogFileMaxSize 0 +MaxAttempts 5 +Checks 24 +DatabaseDirectory /var/lib/clamav/ +NotifyClamd +DNSDatabaseInfo current.cvd.clamav.net diff --git a/packages/clamav/files/libtool-fix.patch b/packages/clamav/files/libtool-fix.patch new file mode 100644 index 0000000000..05a4876dd0 --- /dev/null +++ b/packages/clamav/files/libtool-fix.patch @@ -0,0 +1,23 @@ +Use our own libtool that knows about cross compiling, not the libtool +that is included. + +--- clamav-0.88.4/acinclude.m4 2006/09/12 08:07:27 1.1 ++++ clamav-0.88.4/acinclude.m4 2006/09/12 08:16:31 +@@ -520,7 +520,7 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL="$host_alias-libtool" + AC_SUBST(LIBTOOL)dnl + + # Prevent multiple expansion +@@ -1238,7 +1238,7 @@ + rm="rm -f" + + # Global variables: +-default_ofile=libtool ++default_ofile=${host_alias}-libtool + can_build_shared=yes + + # All known linkers require a `.a' archive for static linking (except M$VC, diff --git a/packages/clamav/site/.mtn2git_empty b/packages/clamav/site/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/clamav/site/.mtn2git_empty diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 428a48bc28..160f7f0028 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Generic SlugOS image" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r28" +PR = "r31" # SLUGOS_IMAGENAME defines the name of the image to be build, if it # is not set this package will be skipped! @@ -71,9 +71,16 @@ SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" # kernel-module-netconsole is here because it is small and is # highly useful on minimal systems (which really don't have anywhere # other than the network to output error messages!) -SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole" - -RDEPENDS = "kernel ixp-eth \ +SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole \ + kernel-module-ixp4xx-qmgr kernel-module-ixp4xx-npe \ + kernel-module-ixp4xx-mac kernel-module-ixp4xx-rng \ + kernel-module-mii kernel-module-jbd \ + kernel-module-ext2 kernel-module-ext3 \ + kernel-module-scsi-mod kernel-module-usbcore \ + kernel-module-ehci-hcd kernel-module-ohci-hcd \ + kernel-module-uhci-hcd kernel-module-usb-storage" + +RDEPENDS = "kernel ixp4xx-npe \ base-files base-passwd netbase \ busybox hotplug-ng initscripts-slugos slugos-init \ update-modules sysvinit tinylogin \ diff --git a/packages/ixp4xx/ixp4xx-npe_0.1.bb b/packages/ixp4xx/ixp4xx-npe_0.1.bb index 830c24fb02..4008c1af11 100644 --- a/packages/ixp4xx/ixp4xx-npe_0.1.bb +++ b/packages/ixp4xx/ixp4xx-npe_0.1.bb @@ -1,7 +1,30 @@ DESCRIPTION = "Firmware for the IXP4xx line of devices" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" -LICENSE = "Intel Public Licence" -PR = "r0" +HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm" +LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm" +LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm" +PR = "r1" + +# You must download the following software to your OpenEmbedded downloads +# directory before using this package: +# +# IPL_ixp400AccessLibrary-2_1.zip +# IPL_ixp400NpeLibrary-2_1.zip +# +# To do this go to the LICENSE_HOMEPAGE above, register/login (using a +# web browser which is supported by the login page), this will give you +# access to the web page from which you can download the software - you +# need the: "Intel® IXP400 Software and RedBoot* Boot Loader" and, from +# this the "Intel Hardware Access Software" and "NPE Microcode" (both +# versions 2.1, encryption is not required.) +# +# Store the files with the names given below in your downloads directory +# and store the 32 character md5sum of the file in a file of the same +# name with the additional extension .md5: +# +# IPL_ixp400AccessLibrary-2_1.zip.md5 +# IPL_ixp400NpeLibrary-2_1.zip.md5 +# SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400AccessLibrary-2_1.zip" inherit native @@ -13,6 +36,6 @@ do_compile() { } do_install() { - install -d ${D}/usr/lib/firmware/NPE-B - install ${S}/NPE-B.010c0200 ${D}/usr/lib/firmware/NPE-B/ + install -d ${D}/lib/firmware + install ${S}/NPE-B.010c0200 ${D}/lib/firmware/ } diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb new file mode 100644 index 0000000000..f5af772052 --- /dev/null +++ b/packages/linux/ixp4xx-kernel_2.6.18.bb @@ -0,0 +1,41 @@ +# Kernel for IXP4xx +# +# Increment PR_CONFIG for changes to the ixp4xx-kernel specific +# defconfig (do *NOT* increment anything in here for changes +# to other kernel configs!) +PR_CONFIG = "1" +# +# Increment the number below (i.e. the digits after PR) when +# making changes within this file or for changes to the patches +# applied to the kernel. +PR = "r0.${PR_CONFIG}" + +require ixp4xx-kernel.inc + +SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18/defconfig" + +# IXP4XX_PATCHES - full list of patches to apply +IXP4XX_PATCHES = "" + +SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18" + +IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1" +# IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1" +# IXP4XX_PATCHES += "${SVN_SRC}/06-timer-nslu2.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/07-copypage-xscale.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/13-zd1211-arm-fix.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/30-ixp4xx-0.1.0-driver.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-localfixes.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/32-nslu-setup-mac.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/40-scsi-idle.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1" +# IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1" +# IXP4XX_PATCHES += "${SVN_SRC}/76-dsmg600-pwrbtn.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/77-velocity-module.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/78-velocity-BE.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/79-rtl8110sb-fix.diff;patch=1" diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index d9adf9ede4..7d17bdfbb9 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r26" +PR = "r27" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -28,8 +28,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ - ${RPSRC}/alsa/asoc-v0.11.3.patch;patch=1 \ - ${RPSRC}/alsa/asoc_zaurus_fixups-r0.patch;patch=1 \ + ${RPSRC}/alsa/asoc-v0.11.5.patch;patch=1 \ ${RPSRC}/asoc_makefile-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb new file mode 100644 index 0000000000..3ccdbac353 --- /dev/null +++ b/packages/rdesktop/rdesktop_1.5.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Rdesktop rdp client for X" +DEPENDS = "virtual/libx11 openssl" +HOMEPAGE = "http://www.rdesktop.org" +SECTION = "x11/network" +MAINTAINER = "Adrian Davey <ade@beth2.org>" +LICENSE = "GPL" +PV = "1.5.0" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb index e111189e6f..ade7621aff 100644 --- a/packages/rdesktop/rdesktop_cvs.bb +++ b/packages/rdesktop/rdesktop_cvs.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.rdesktop.org" SECTION = "x11/network" MAINTAINER = "Adrian Davey <ade@beth2.org>" LICENSE = "GPL" -PV = "1.3.1+cvs${SRCDATE}" -PR = "r1" +PV = "1.5.0+cvs${SRCDATE}" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/rdesktop;module=rdesktop" S = "${WORKDIR}/rdesktop" diff --git a/packages/socat/socat-1.3.2.1/xioinitialize.patch b/packages/socat/socat-1.3.2.1/xioinitialize.patch new file mode 100644 index 0000000000..24e816cfd7 --- /dev/null +++ b/packages/socat/socat-1.3.2.1/xioinitialize.patch @@ -0,0 +1,52 @@ +diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c +--- socat-1.3/xioinitialize.c 2003-05-23 08:24:53.000000000 +0200 ++++ socat-1.3_patched/xioinitialize.c 2006-09-09 18:18:19.000000000 +0200 +@@ -19,48 +19,10 @@ + assert(O_WRONLY==1); + assert(O_RDWR==2); + +- /* some assertions about termios */ +-#if WITH_TERMIOS +-#ifdef CRDLY +- assert(3 << opt_crdly.arg3 == CRDLY); +-#endif +-#ifdef TABDLY +- assert(3 << opt_tabdly.arg3 == TABDLY); +-#endif +- assert(3 << opt_csize.arg3 == CSIZE); +- { +- union { +- struct termios termarg; +- tcflag_t flags[4]; +-#if HAVE_TERMIOS_ISPEED +- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; +-#endif +- } tdata; +- tdata.termarg.c_iflag = 0x12345678; +- tdata.termarg.c_oflag = 0x23456789; +- tdata.termarg.c_cflag = 0x3456789a; +- tdata.termarg.c_lflag = 0x456789ab; +- assert(tdata.termarg.c_iflag == tdata.flags[0]); +- assert(tdata.termarg.c_oflag == tdata.flags[1]); +- assert(tdata.termarg.c_cflag == tdata.flags[2]); +- assert(tdata.termarg.c_lflag == tdata.flags[3]); +-#if HAVE_TERMIOS_ISPEED +- tdata.termarg.c_ispeed = 0x56789abc; +- tdata.termarg.c_ospeed = 0x6789abcd; +- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); +- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]); +-#endif +- } +-#endif +- + /* these dependencies required in applyopts() for OFUNC_FCNTL */ + assert(F_GETFD == F_SETFD-1); + assert(F_GETFL == F_SETFL-1); + +- if (Atexit(xioexit) < 0) { +- Error("atexit(xioexit) failed"); +- return -1; +- } + xioinitialized = 1; + return 0; + } diff --git a/packages/socat/socat-1.3.2.1/xioopen.patch b/packages/socat/socat-1.3.2.1/xioopen.patch new file mode 100644 index 0000000000..456862653a --- /dev/null +++ b/packages/socat/socat-1.3.2.1/xioopen.patch @@ -0,0 +1,11 @@ +diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h +--- socat-1.3/xioopen.h 2003-02-15 15:26:22.000000000 +0100 ++++ socat-1.3_patched/xioopen.h 2006-09-05 10:49:15.000000000 +0200 +@@ -42,7 +42,6 @@ + extern const char *ddirection[]; + extern const char *filetypenames[]; + extern const struct addrname addressnames[]; +-extern const char *addressgroupnames[]; + extern const struct optname optionnames[]; + + extern int xioopen_makedual(xiofile_t *file); diff --git a/packages/socat/socat_1.3.2.1.bb b/packages/socat/socat_1.3.2.1.bb index 378ea60729..41ea3a8309 100644 --- a/packages/socat/socat_1.3.2.1.bb +++ b/packages/socat/socat_1.3.2.1.bb @@ -3,12 +3,18 @@ DEPENDS = "openssl" DESCRIPTION = "Socat is a relay for bidirectional data \ transfer between two independent data channels." LICENSE = "GPL" +PR="r1" + SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ - file://ldflags.patch;patch=1" + file://xioopen.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://xioinitialize.patch;patch=1" + S = "${WORKDIR}/socat-1.3" inherit autotools do_install_prepend () { + mkdir -p ${D}${bindir} install -d ${D}${bindir} ${D}${mandir}/man1 } diff --git a/packages/tor/.mtn2git_empty b/packages/tor/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tor/.mtn2git_empty diff --git a/packages/tor/files/.mtn2git_empty b/packages/tor/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tor/files/.mtn2git_empty diff --git a/packages/tor/files/tor.init b/packages/tor/files/tor.init new file mode 100755 index 0000000000..e421347440 --- /dev/null +++ b/packages/tor/files/tor.init @@ -0,0 +1,44 @@ + +#! /bin/sh +# +# This is an init script for Tor on Openzaurus +# + + +test -f /usr/bin/tor || exit 0 +test -f /etc/tor/tor-tsocks.conf || exit 0 + +case "$1" in + start) + echo -n "Starting tor daemon" + start-stop-daemon --start --quiet --exec /usr/bin/tor & + echo "." + ;; + stop) + echo -n "Stopping tor daemon" + start-stop-daemon --stop --quiet --exec /usr/bin/tor & + echo "." + ;; + restart) + echo -n "Stopping tor daemon" + start-stop-daemon --stop --quiet --exec /usr/bin/tor & + sleep 1 + echo -n "Starting tor daemon" + start-stop-daemon --start --quiet --exec /usr/bin/tor & + echo "." + ;; + start_socats) + echo "Starting socats" + # EXAMPLE + socat TCP4-LISTEN:6667,fork SOCKS4A:localhost:irc.freenode.net:6667,socksport=9050 & + ;; + stop_socats) + echo "Stopping all socat processes!" + killall socat + ;; + *) + echo "Usage: /etc/init.d/tor {start|stop|restart|start_socats|stop_socats}" + exit 1 +esac + +exit 0 diff --git a/packages/tor/tor-0.1.1.23/.mtn2git_empty b/packages/tor/tor-0.1.1.23/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tor/tor-0.1.1.23/.mtn2git_empty diff --git a/packages/tor/tor-0.1.1.23/compat.patch b/packages/tor/tor-0.1.1.23/compat.patch new file mode 100644 index 0000000000..6c54032667 --- /dev/null +++ b/packages/tor/tor-0.1.1.23/compat.patch @@ -0,0 +1,14 @@ +diff -Naur tor-0.1.1.23/src/common/compat.h tor-0.1.1.23_patched/src/common/compat.h +--- tor-0.1.1.23/src/common/compat.h 2006-07-25 05:52:47.000000000 +0200 ++++ tor-0.1.1.23_patched/src/common/compat.h 2006-09-04 22:26:42.000000000 +0200 +@@ -31,10 +31,6 @@ + #endif + #include <stdarg.h> + +-#ifndef NULL_REP_IS_ZERO_BYTES +-#error "It seems your platform does not represent NULL as zero. We can't cope." +-#endif +- + /* ===== Compiler compatibility */ + + /* GCC can check printf types on arbitrary functions. */ diff --git a/packages/tor/tor-0.1.1.23/configure.patch b/packages/tor/tor-0.1.1.23/configure.patch new file mode 100644 index 0000000000..dcd214feb2 --- /dev/null +++ b/packages/tor/tor-0.1.1.23/configure.patch @@ -0,0 +1,126 @@ +diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in +--- tor-0.1.1.23/configure.in 2006-07-30 06:40:28.000000000 +0200 ++++ tor-0.1.1.23_patched/configure.in 2006-09-04 22:18:15.000000000 +0200 +@@ -169,38 +169,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link libevent], +- ac_cv_libevent_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- le_runs=no +- linked_with=nothing +- for le_extra in "" "-Wl,-R$le_libdir" "-R$le_libdir" ; do +- LDFLAGS="$le_extra $saved_LDFLAGS" +- AC_TRY_RUN([void *event_init(void); +- int main(int c, char **v) { +- event_init(); return 0; +- }], +- libevent_runs=yes, libevent_runs=no) +- if test $libevent_runs = yes ; then +- if test -z "$le_extra" ; then +- ac_cv_libevent_linker_option='(none)' +- else +- ac_cv_libevent_linker_option=$le_extra +- fi +- le_runs=yes +- break +- fi +- done +- if test $le_runs = no ; then +- AC_MSG_ERROR([Found linkable libevent in $ac_cv_libevent_dir, but it doesn't run, even with -R. Maybe specify another using --with-libevent-dir?]) +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test $ac_cv_libevent_linker_option != '(none)' ; then +- LDFLAGS="$ac_cv_libevent_linker_option $LDFLAGS" +-fi +- + dnl ------------------------------------------------------ + dnl Where do you live, openssl? And how do we call you? + +@@ -266,66 +234,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link OpenSSL], +- ac_cv_openssl_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- ssl_runs=no +- linked_with=nothing +- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do +- LDFLAGS="$ssl_extra $saved_LDFLAGS" +- AC_TRY_RUN([ +-#include <string.h> +-#include <openssl/rand.h> +-int main(void) +-{ +- char a[2048]; +- memset(a, 0, sizeof(a)); +- RAND_add(a, sizeof(a), sizeof(a)); +- return(RAND_status() <= 0); +-} +- ], +- openssl_runs=yes, openssl_runs=no) +- if test $openssl_runs = yes ; then +- if test "$linked_with" = nothing; then +- linked_with="$ssl_extra" +- fi +- AC_TRY_RUN([ +-#include <openssl/opensslv.h> +-#include <openssl/crypto.h> +-int main(void) { +-return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; +-}], +- right_version=yes, right_version=no) +- if test "$right_version" = yes; then +- if test -z "$ssl_extra" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$ssl_extra +- fi +- ssl_runs=yes +- break +- fi +- fi +- done +- if test $ssl_runs = no ; then +- if test "$linked_with" = 'nothing' ; then +- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) +- else +- if test -z "$linked_with" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$linked_with +- fi +- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) +- fi +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test "$ac_cv_openssl_linker_option" != '(none)' ; then +- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" +-fi +- + dnl Make sure to enable support for large off_t if avalable. + + AC_SYS_LARGEFILE +@@ -377,16 +285,6 @@ + AC_CHECK_SIZEOF(__int64) + AC_CHECK_SIZEOF(void *) + AC_CHECK_SIZEOF(time_t) +-AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ +-AC_TRY_RUN([ +-int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }], +- tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes) +-]) +- +-if test $tor_cv_time_t_signed = yes; then +- AC_DEFINE([TIME_T_IS_SIGNED], 1, +- [Define to 1 iff time_t is signed]) +-fi + + AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT() + #ifdef HAVE_SYS_SOCKET_H diff --git a/packages/tor/tor-0.1.1.23/make.patch b/packages/tor/tor-0.1.1.23/make.patch new file mode 100644 index 0000000000..8b8851b22b --- /dev/null +++ b/packages/tor/tor-0.1.1.23/make.patch @@ -0,0 +1,11 @@ +diff -Naur tor-0.1.1.23/Makefile.in tor-0.1.1.23_patched/Makefile.in +--- tor-0.1.1.23/Makefile.in 2006-07-30 06:42:20.000000000 +0200 ++++ tor-0.1.1.23_patched/Makefile.in 2006-09-04 20:13:51.000000000 +0200 +@@ -65,7 +65,6 @@ + host_alias = @host_alias@ + host_triplet = @host@ + BINDIR = @BINDIR@ +-CC = @CC@ + CONFDIR = @CONFDIR@ + HAVE_LIB = @HAVE_LIB@ + LIB = @LIB@ diff --git a/packages/tor/tor-0.1.1.23/openssl.patch b/packages/tor/tor-0.1.1.23/openssl.patch new file mode 100644 index 0000000000..e413486273 --- /dev/null +++ b/packages/tor/tor-0.1.1.23/openssl.patch @@ -0,0 +1,71 @@ +diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in +--- tor-0.1.1.23/configure.in 2006-09-04 20:42:21.000000000 +0200 ++++ tor-0.1.1.23_patched/configure.in 2006-09-04 20:45:09.000000000 +0200 + +@@ -234,66 +234,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link OpenSSL], +- ac_cv_openssl_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- ssl_runs=no +- linked_with=nothing +- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do +- LDFLAGS="$ssl_extra $saved_LDFLAGS" +- AC_TRY_RUN([ +-#include <string.h> +-#include <openssl/rand.h> +-int main(void) +-{ +- char a[2048]; +- memset(a, 0, sizeof(a)); +- RAND_add(a, sizeof(a), sizeof(a)); +- return(RAND_status() <= 0); +-} +- ], +- openssl_runs=yes, openssl_runs=no) +- if test $openssl_runs = yes ; then +- if test "$linked_with" = nothing; then +- linked_with="$ssl_extra" +- fi +- AC_TRY_RUN([ +-#include <openssl/opensslv.h> +-#include <openssl/crypto.h> +-int main(void) { +-return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; +-}], +- right_version=yes, right_version=no) +- if test "$right_version" = yes; then +- if test -z "$ssl_extra" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$ssl_extra +- fi +- ssl_runs=yes +- break +- fi +- fi +- done +- if test $ssl_runs = no ; then +- if test "$linked_with" = 'nothing' ; then +- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) +- else +- if test -z "$linked_with" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$linked_with +- fi +- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) +- fi +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test "$ac_cv_openssl_linker_option" != '(none)' ; then +- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" +-fi +- + dnl Make sure to enable support for large off_t if avalable. + + AC_SYS_LARGEFILE diff --git a/packages/tor/tor_0.1.1.23.bb b/packages/tor/tor_0.1.1.23.bb new file mode 100644 index 0000000000..54f9ed2f7d --- /dev/null +++ b/packages/tor/tor_0.1.1.23.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Tor is a network of virtual tunnels that allows people and groups \ + to improve their privacy and security on the Internet." +SECTION = "console/network" +PRIORITY = "optional" +MAINTAINER = "Bastian Ballmann <balle@chaostal.de>" +HOMEPAGE = "http://tor.eff.org" +LICENSE = "BSD" +PR="r0" +DEPENDS = "libevent openssl zlib" + +SRC_URI = "http://tor.eff.org/dist/tor-0.1.1.23.tar.gz \ + file://configure.patch;patch=1;pnum=1 \ + file://make.patch;patch=1;pnum=1 \ + file://compat.patch;patch=1;pnum=1 \ + file://tor.init" + + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "tor" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/tor.init ${D}${sysconfdir}/init.d/tor +} diff --git a/site/i486-linux b/site/i486-linux index 2fc4c476af..f2998e7fb2 100644 --- a/site/i486-linux +++ b/site/i486-linux @@ -169,3 +169,9 @@ lftp_cv___va_copy=${lftp_cv___va_copy=yes} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=no} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} + +# clamav +clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} +clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} +clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} diff --git a/site/i586-linux b/site/i586-linux index b4fda09b81..a57d841003 100644 --- a/site/i586-linux +++ b/site/i586-linux @@ -144,3 +144,9 @@ lftp_cv___va_copy=${lftp_cv___va_copy=yes} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=no} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} + +# clamav +clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} +clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} +clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} diff --git a/site/sh4-linux b/site/sh4-linux index bb0bf09e6c..d9513ec182 100644 --- a/site/sh4-linux +++ b/site/sh4-linux @@ -281,3 +281,9 @@ ac_cv_va_copy=${ac_cv_va_copy=no} ac_cv_va_val_copy=${ac_cv_va_val_copy=yes} ac_cv___va_copy=${ac_cv___va_copy=yes} racoon_cv_bug_getaddrinfo=${racoon_cv_bug_getaddrinfo=no} + +# clamav +clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} +clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes} +clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes} +ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} |