From 196fe037fda65eaa9c1c3e07d0651f8cd6c363e2 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 16 May 2007 01:32:57 +0000 Subject: clamav: Add 0.90.2 version, remove older versions plus a number of other changes: * Remove 0.88.6 * Added 0.90.2 * Add a new clamav-conf package to hold clamd.conf. This is needed by both clamd and freshclam and previously you needed to install clamd even if you didn't want it just to get freshclam to work. * Assume that /var/lib is non-volatile. Move the virus database there by default. * Update configuration files for the new 0.9x syntax. * Simplify the init scripts. * Indicate the freshclam also provides clamav data, so if you install freshclam you don't need data. * NOTE: There are incompatible changes to libclamav in this release, anything that links directly against the library will need to be updated. --- packages/clamav/clamav-0.88.7/.mtn2git_empty | 0 packages/clamav/clamav-0.88.7/clamd.conf | 25 ++++++++ .../clamav/clamav-0.88.7/cross-compile-fix.patch | 74 ++++++++++++++++++++++ packages/clamav/clamav-0.88.7/freshclam.conf | 19 ++++++ packages/clamav/clamav-0.88.7/libtool-fix.patch | 23 +++++++ packages/clamav/clamav-0.90.2/.mtn2git_empty | 0 packages/clamav/clamav-0.90.2/clamd.conf | 27 ++++++++ .../clamav/clamav-0.90.2/cross-compile-fix.patch | 68 ++++++++++++++++++++ packages/clamav/clamav-0.90.2/freshclam.conf | 21 ++++++ packages/clamav/clamav.inc | 39 +++++------- packages/clamav/clamav_0.88.6.bb | 3 - packages/clamav/clamav_0.88.7.bb | 4 +- packages/clamav/clamav_0.90.2.bb | 16 +++++ packages/clamav/files/clamav-daemon.default | 1 - packages/clamav/files/clamav-daemon.init | 14 ++-- packages/clamav/files/clamav-freshclam.init | 58 ++++------------- packages/clamav/files/clamd.conf | 25 -------- packages/clamav/files/cross-compile-fix.patch | 74 ---------------------- packages/clamav/files/freshclam.conf | 19 ------ packages/clamav/files/libtool-fix.patch | 23 ------- packages/clamav/files/volatiles.02_clamav-data | 4 -- packages/clamav/files/volatiles.03_clamav-data | 4 ++ 22 files changed, 318 insertions(+), 223 deletions(-) create mode 100644 packages/clamav/clamav-0.88.7/.mtn2git_empty create mode 100644 packages/clamav/clamav-0.88.7/clamd.conf create mode 100644 packages/clamav/clamav-0.88.7/cross-compile-fix.patch create mode 100644 packages/clamav/clamav-0.88.7/freshclam.conf create mode 100644 packages/clamav/clamav-0.88.7/libtool-fix.patch create mode 100644 packages/clamav/clamav-0.90.2/.mtn2git_empty create mode 100644 packages/clamav/clamav-0.90.2/clamd.conf create mode 100644 packages/clamav/clamav-0.90.2/cross-compile-fix.patch create mode 100644 packages/clamav/clamav-0.90.2/freshclam.conf delete mode 100644 packages/clamav/clamav_0.88.6.bb create mode 100644 packages/clamav/clamav_0.90.2.bb delete mode 100644 packages/clamav/files/clamav-daemon.default delete mode 100644 packages/clamav/files/clamd.conf delete mode 100644 packages/clamav/files/cross-compile-fix.patch delete mode 100644 packages/clamav/files/freshclam.conf delete mode 100644 packages/clamav/files/libtool-fix.patch delete mode 100644 packages/clamav/files/volatiles.02_clamav-data create mode 100644 packages/clamav/files/volatiles.03_clamav-data (limited to 'packages') diff --git a/packages/clamav/clamav-0.88.7/.mtn2git_empty b/packages/clamav/clamav-0.88.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clamav/clamav-0.88.7/clamd.conf b/packages/clamav/clamav-0.88.7/clamd.conf new file mode 100644 index 0000000000..485c80d420 --- /dev/null +++ b/packages/clamav/clamav-0.88.7/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/clamav-0.88.7/cross-compile-fix.patch b/packages/clamav/clamav-0.88.7/cross-compile-fix.patch new file mode 100644 index 0000000000..690d680c66 --- /dev/null +++ b/packages/clamav/clamav-0.88.7/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 ) + 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 + 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 +-#include +-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 ++ #include ++ 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 +-#include +-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 ++ #include ++ 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/clamav-0.88.7/freshclam.conf b/packages/clamav/clamav-0.88.7/freshclam.conf new file mode 100644 index 0000000000..770490b3ab --- /dev/null +++ b/packages/clamav/clamav-0.88.7/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/clamav-0.88.7/libtool-fix.patch b/packages/clamav/clamav-0.88.7/libtool-fix.patch new file mode 100644 index 0000000000..05a4876dd0 --- /dev/null +++ b/packages/clamav/clamav-0.88.7/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/clamav-0.90.2/.mtn2git_empty b/packages/clamav/clamav-0.90.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clamav/clamav-0.90.2/clamd.conf b/packages/clamav/clamav-0.90.2/clamd.conf new file mode 100644 index 0000000000..74ebcf5c3f --- /dev/null +++ b/packages/clamav/clamav-0.90.2/clamd.conf @@ -0,0 +1,27 @@ +## Please read the clamd.conf(5) manual before editing this file. +LogFile /var/log/clamav/clamav.log +LogFileMaxSize 0 +LogTime yes +PidFile /var/run/clamav/clamd.pid +DatabaseDirectory /var/lib/clamav +LocalSocket /var/run/clamav/clamd.ctl +FixStaleSocket yes +MaxConnectionQueueLength 15 +MaxThreads 10 +ReadTimeout 180 +SelfCheck 1800 +User clamav +AllowSupplementaryGroups yes +ScanPE yes +ScanELF yes +DetectBrokenExecutables yes +ScanOLE2 yes +ScanMail yes +PhishingSignatures yes +ScanHTML yes +ScanArchive yes +ArchiveMaxRecursion 8 +ArchiveMaxFiles 1000 +ArchiveMaxFileSize 10M +ArchiveMaxCompressionRatio 250 +ArchiveBlockMax yes diff --git a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch new file mode 100644 index 0000000000..2f346b2f0f --- /dev/null +++ b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch @@ -0,0 +1,68 @@ +Add some caching of values which can't be determined when +cross-compiling. This lets us define the values via the site files. + +Index: clamav-0.90.2/configure.in +=================================================================== +--- clamav-0.90.2.orig/configure.in 2007-04-13 09:10:37.000000000 +1000 ++++ clamav-0.90.2/configure.in 2007-05-16 09:33:48.000000000 +1000 +@@ -60,19 +60,21 @@ + + dnl Check for broken snprintf (code by Phil Oleson ) + if test "x$ac_cv_func_snprintf" = "xyes" ; then +- AC_MSG_CHECKING([whether snprintf correctly terminates long strings]) ++ AC_CACHE_CHECK([whether snprintf correctly terminates long strings], ++ [ac_cv_have_broken_snprintf], [ + AC_TRY_RUN( + [ + #include + 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]) +- ] +- ) ++ [ ac_cv_have_broken_snprintf="no" ], ++ [ ac_cv_have_broken_snprintf="yes" ] ++ ) ++ ]) ++ if test "$ac_cv_have_broken_snprintf" = "yes"; 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 +@@ -370,18 +372,28 @@ + AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file]) + + dnl check for in_port_t definition ++AC_CACHE_CHECK([for in_port_t], [clamav_av_have_in_port_t], [ + AC_TRY_RUN([ + #include + #include + 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)) ++], [ clamav_av_have_in_port_t="yes" ], [ clamav_av_have_in_port_t="no" ]) ++]) ++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_CACHE_CHECK([for in_addr_t], [clamav_av_have_in_addr_t], [ + AC_TRY_RUN([ + #include + #include + 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)) ++], [ clamav_av_have_in_addr_t="yes" ], [ clamav_av_have_in_addr_t="no" ]) ++]) ++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/clamav-0.90.2/freshclam.conf b/packages/clamav/clamav-0.90.2/freshclam.conf new file mode 100644 index 0000000000..fd45b0dd85 --- /dev/null +++ b/packages/clamav/clamav-0.90.2/freshclam.conf @@ -0,0 +1,21 @@ +## 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 + +DatabaseDirectory /var/lib/clamav/ +UpdateLogFile /var/log/clamav/freshclam.log +PidFile /var/run/clamav/freshclam.pid +DatabaseOwner clamav +AllowSupplementaryGroups yes +DNSDatabaseInfo current.cvd.clamav.net +MaxAttempts 5 +Checks 24 +NotifyClamd /etc/clamd.conf diff --git a/packages/clamav/clamav.inc b/packages/clamav/clamav.inc index b18cd06c24..c00da1d6d7 100644 --- a/packages/clamav/clamav.inc +++ b/packages/clamav/clamav.inc @@ -12,19 +12,19 @@ SECTION = "network" LICENSE = "GPL" DEPENDS = "zlib bzip2 gmp" RDEPENDS_${PN} = "${PN}-data" -RDEPENDS_${PN}-daemon = "${PN}-data" +RDEPENDS_${PN}-daemon = "${PN}-data ${PN}-conf" +RDEPENDS_${PN}-freshclam = "${PN}-conf" RRECOMMENDS_${PN} = "${PN}-freshclam" RRECOMMENDS_${PN}-daemon = "${PN}-freshclam" +RPROVIDES_${PN}-freshclam = "${PN}-data" 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 \ - file://volatiles.02_clamav-data \ + file://volatiles.03_clamav-data \ file://volatiles.03_clamav-daemon \ file://volatiles.03_clamav-freshclam" @@ -48,20 +48,13 @@ do_install_append() { # 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 # We need some /var directories - for i in 02_clamav-data 03_clamav-daemon 03_clamav-freshclam; do + for i in 03_clamav-daemon 03_clamav-freshclam 03_clamav-data; do install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i done - - # Move the clamav data to a non-volatile location, we'll symlink back - # If freshclam is running it'll break the link to this static data - # once it has succesfully downloaded an update - install -m 0755 -d ${D}${libdir} - mv ${D}${localstatedir}/lib/clamav ${D}${libdir} } do_stage () { oe_libinstall -a -so libclamav ${STAGING_LIBDIR} @@ -69,22 +62,23 @@ do_stage () { install -m 0644 libclamav/clamav.h ${STAGING_INCDIR} } -PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-data ${PN}-lib" +PACKAGES += "${PN}-freshclam ${PN}-daemon ${PN}-conf ${PN}-data ${PN}-lib" -FILES_${PN} = "${bindir}/clamscan ${bindir}/sigtool ${bindir}/clamdscan" +FILES_${PN} = "${bindir}/clamscan \ + ${bindir}/sigtool \ + ${bindir}/clamdscan" FILES_${PN}-lib = "${libdir}/libclamav.so.*" +FILES_${PN}-conf = "${sysconfdir}/clamd.conf" FILES_${PN}-freshclam = "${bindir}/freshclam \ ${sysconfdir}/freshclam.conf \ ${sysconfdir}/init.d/clamav-freshclam \ ${sysconfdir}/default/volatiles/03_clamav-freshclam" -FILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sbindir}/clamd \ +FILES_${PN}-daemon = "${sbindir}/clamd \ ${sysconfdir}/init.d/clamav-daemon \ - ${sysconfdir}/default/clamav-daemon \ ${sysconfdir}/default/volatiles/03_clamav-daemon" -FILES_${PN}-data = "${libdir}/clamav/main.cvd \ - ${libdir}/clamav/daily.cvd \ - ${sysconfdir}/default/volatiles/02_clamav-data" +FILES_${PN}-data = "${localstatedir}/lib/clamav/main.cvd \ + ${localstatedir}/lib/clamav/daily.cvd \ + ${sysconfdir}/default/volatiles/03_clamav-data" FILES_${PN}-dev += "${bindir}/clamav-config" # Add clamav's user and groups @@ -111,9 +105,10 @@ pkg_postinst_${PN}-data () { } # Indicate that the default files are configuration files -CONFFILES_${PN}-daemon = "${sysconfdir}/clamd.conf \ - ${sysconfdir}/default/clamav-daemon" +CONFFILES_${PN}-conf = "${sysconfdir}/clamd.conf" CONFFILES_${PN}-freshclam = "${sysconfdir}/freshclam.conf" +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" diff --git a/packages/clamav/clamav_0.88.6.bb b/packages/clamav/clamav_0.88.6.bb deleted file mode 100644 index e721558efe..0000000000 --- a/packages/clamav/clamav_0.88.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require clamav.inc - -PR = "r1" diff --git a/packages/clamav/clamav_0.88.7.bb b/packages/clamav/clamav_0.88.7.bb index fec4ae59d8..2728c31590 100644 --- a/packages/clamav/clamav_0.88.7.bb +++ b/packages/clamav/clamav_0.88.7.bb @@ -1,3 +1,5 @@ require clamav.inc -PR = "r0" +PR = "r1" + +SRC_URI_append += " file://libtool-fix.patch;patch=1" diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb new file mode 100644 index 0000000000..ab60a66c0a --- /dev/null +++ b/packages/clamav/clamav_0.90.2.bb @@ -0,0 +1,16 @@ +require clamav.inc +PR = "r0" + +# 0.9x requires curl for incremental database updates +DEPENDS += "curl" + +# 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-zlib=${STAGING_DIR}/${HOST_SYS} \ + --with-libcurl \ + --with-dbdir=${localstatedir}/lib/clamav" + +# Package up configuration utility - new for 0.9x +PACKAGES += "${PN}-clamconf" +FILES_${PN}-clamconf = "${bindir}/clamconf" diff --git a/packages/clamav/files/clamav-daemon.default b/packages/clamav/files/clamav-daemon.default deleted file mode 100644 index bc19984183..0000000000 --- a/packages/clamav/files/clamav-daemon.default +++ /dev/null @@ -1 +0,0 @@ -# Options for clamav-daemon (clamd process) diff --git a/packages/clamav/files/clamav-daemon.init b/packages/clamav/files/clamav-daemon.init index bab7a184d7..6fd07146ea 100644 --- a/packages/clamav/files/clamav-daemon.init +++ b/packages/clamav/files/clamav-daemon.init @@ -3,18 +3,20 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/clamd NAME="clamd" DESC="ClamAV daemon" -CLAMAVCONF=/etc/clamd.conf +CLAMAV_CONF=/etc/clamd.conf +PID=/var/run/clamav/clamd.pid set -e -test -r /etc/default/clamav-daemon && . /etc/default/clamav-daemon test -x "$DAEMON" || exit 0 -test ! -r "$CLAMAVCONF" && exit 0 -if [ `grep -q "^Example" $CLAMAVCONF` ]; then +if [ ! -r "$CLAMAV_CONF" ]; then + echo "ClamAV configuration file $CLAMAV_CONF not found. Exiting" + exit 0 +fi +if [ `grep -q "^Example" $CLAMAV_CONF` ]; then echo "$DESC is not configured." exit 0 fi -pidfile="`grep ^PidFile $CLAMAVCONF | awk '{print $2}'`" case "$1" in start) @@ -25,7 +27,7 @@ case "$1" in stop) echo -n "Stopping $DESC: " - start-stop-daemon -K -p $pidfile + start-stop-daemon -K -p $PID ;; restart|force-reload) diff --git a/packages/clamav/files/clamav-freshclam.init b/packages/clamav/files/clamav-freshclam.init index 490a41e31f..21f02008f5 100644 --- a/packages/clamav/files/clamav-freshclam.init +++ b/packages/clamav/files/clamav-freshclam.init @@ -3,70 +3,38 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/freshclam NAME=freshclam DESC="ClamAV virus database updater" -CLAMAV_CONF_FILE=/etc/clamd.conf -FRESHCLAM_CONF_FILE=/etc/freshclam.conf -pidfile=/var/run/clamav/freshclam.pid +FRESHCLAM_CONF=/etc/freshclam.conf +CLAMAV_CONF=/etc/clamd.conf +PID=/var/run/clamav/freshclam.pid set -e -test -r /etc/default/clamav-freshclam && . /etc/default/clamav-freshclam test -x "$DAEMON" || exit 0 -test ! -r "$CLAMAV_CONF_FILE" && exit 0 - -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" - -[ -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/ +if [ ! -r "$CLAMAV_CONF" ]; then + echo "ClamAV configuration file $CLAMAV_CONF not found. Exiting" + exit 0 +fi +if [ ! -r "$FRESHCLAM_CONF" ]; then + echo "Freshclam configuration file $FRESHCLAM_CONF not found. Exiting" + exit 0 fi 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" + freshclam ;; start) echo -n "Starting $DESC: " - start-stop-daemon -S -x $DAEMON -- -d --quiet -p $pidfile + start-stop-daemon -S -x $DAEMON -- -d --quiet -p $PID echo "$NAME." ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon -K -p $pidfile + start-stop-daemon -K -p $PID ;; restart|force-reload) diff --git a/packages/clamav/files/clamd.conf b/packages/clamav/files/clamd.conf deleted file mode 100644 index 485c80d420..0000000000 --- a/packages/clamav/files/clamd.conf +++ /dev/null @@ -1,25 +0,0 @@ -## 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 deleted file mode 100644 index 690d680c66..0000000000 --- a/packages/clamav/files/cross-compile-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 ) - 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 - 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 --#include --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 -+ #include -+ 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 --#include --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 -+ #include -+ 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 deleted file mode 100644 index 770490b3ab..0000000000 --- a/packages/clamav/files/freshclam.conf +++ /dev/null @@ -1,19 +0,0 @@ -## 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 deleted file mode 100644 index 05a4876dd0..0000000000 --- a/packages/clamav/files/libtool-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/files/volatiles.02_clamav-data b/packages/clamav/files/volatiles.02_clamav-data deleted file mode 100644 index 99dc98b323..0000000000 --- a/packages/clamav/files/volatiles.02_clamav-data +++ /dev/null @@ -1,4 +0,0 @@ -# -d clamav clamav 0755 /var/lib/clamav none -l clamav clamav 0644 /var/lib/clamav/main.cvd /usr/lib/clamav/main.cvd -l clamav clamav 0644 /var/lib/clamav/daily.cvd /usr/lib/clamav/daily.cvd diff --git a/packages/clamav/files/volatiles.03_clamav-data b/packages/clamav/files/volatiles.03_clamav-data new file mode 100644 index 0000000000..8fdb0a742a --- /dev/null +++ b/packages/clamav/files/volatiles.03_clamav-data @@ -0,0 +1,4 @@ +# +d clamav clamav 0755 /var/lib/clamav none +f clamav clamav 0644 /var/lib/clamav/main.cvd none +f clamav clamav 0644 /var/lib/clamav/daily.cvd none -- cgit v1.2.3 From 7542dae3490e74bc94e93dadbf97a1ae085263ed Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 16 May 2007 01:44:46 +0000 Subject: havp 0.86: Add new version. This version is compatile with the clamav 0.9x versions. --- packages/havp/files/sysconfdir-is-etc.patch | 26 ---- packages/havp/havp-0.82/.mtn2git_empty | 0 packages/havp/havp-0.82/sysconfdir-is-etc.patch | 26 ++++ packages/havp/havp-0.86/.mtn2git_empty | 0 packages/havp/havp-0.86/reconfigure.patch | 164 ++++++++++++++++++++++++ packages/havp/havp.inc | 87 +++++++++++++ packages/havp/havp_0.82.bb | 90 +------------ packages/havp/havp_0.86.bb | 5 + 8 files changed, 285 insertions(+), 113 deletions(-) delete mode 100644 packages/havp/files/sysconfdir-is-etc.patch create mode 100644 packages/havp/havp-0.82/.mtn2git_empty create mode 100644 packages/havp/havp-0.82/sysconfdir-is-etc.patch create mode 100644 packages/havp/havp-0.86/.mtn2git_empty create mode 100644 packages/havp/havp-0.86/reconfigure.patch create mode 100644 packages/havp/havp.inc create mode 100644 packages/havp/havp_0.86.bb (limited to 'packages') diff --git a/packages/havp/files/sysconfdir-is-etc.patch b/packages/havp/files/sysconfdir-is-etc.patch deleted file mode 100644 index 518a56f440..0000000000 --- a/packages/havp/files/sysconfdir-is-etc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- havp-0.82/havp/default.h.in 2006/10/05 09:05:18 1.1 -+++ havp-0.82/havp/default.h.in 2006/10/05 09:05:31 -@@ -51,7 +51,7 @@ - "ENABLEAVAST","AVASTSOCKET","AVASTSERVER","AVASTPORT" - //SCANNERS - --#define CONFIGFILE "/usr/local/etc/havp/havp.config" -+#define CONFIGFILE "/etc/havp/havp.config" - - - //############################################################## ---- havp-0.82/havp/params.cpp 2006/10/05 09:04:45 1.1 -+++ havp-0.82/havp/params.cpp 2006/10/05 09:05:06 -@@ -58,9 +58,9 @@ - SetConfig("KEEPBACKTIME", "5"); - SetConfig("TRICKLING", "30"); - SetConfig("WHITELISTFIRST", "true"); -- SetConfig("WHITELIST", "/usr/local/etc/havp/whitelist"); -- SetConfig("BLACKLIST", "/usr/local/etc/havp/blacklist"); -- SetConfig("TEMPLATEPATH", "/usr/local/etc/havp/templates/en"); -+ SetConfig("WHITELIST", "/etc/havp/whitelist"); -+ SetConfig("BLACKLIST", "/etc/havp/blacklist"); -+ SetConfig("TEMPLATEPATH", "/etc/havp/templates/en"); - SetConfig("TEMPDIR", "/var/tmp"); - SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX"); - SetConfig("PIDFILE", "/var/run/havp/havp.pid"); diff --git a/packages/havp/havp-0.82/.mtn2git_empty b/packages/havp/havp-0.82/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/havp/havp-0.82/sysconfdir-is-etc.patch b/packages/havp/havp-0.82/sysconfdir-is-etc.patch new file mode 100644 index 0000000000..518a56f440 --- /dev/null +++ b/packages/havp/havp-0.82/sysconfdir-is-etc.patch @@ -0,0 +1,26 @@ +--- havp-0.82/havp/default.h.in 2006/10/05 09:05:18 1.1 ++++ havp-0.82/havp/default.h.in 2006/10/05 09:05:31 +@@ -51,7 +51,7 @@ + "ENABLEAVAST","AVASTSOCKET","AVASTSERVER","AVASTPORT" + //SCANNERS + +-#define CONFIGFILE "/usr/local/etc/havp/havp.config" ++#define CONFIGFILE "/etc/havp/havp.config" + + + //############################################################## +--- havp-0.82/havp/params.cpp 2006/10/05 09:04:45 1.1 ++++ havp-0.82/havp/params.cpp 2006/10/05 09:05:06 +@@ -58,9 +58,9 @@ + SetConfig("KEEPBACKTIME", "5"); + SetConfig("TRICKLING", "30"); + SetConfig("WHITELISTFIRST", "true"); +- SetConfig("WHITELIST", "/usr/local/etc/havp/whitelist"); +- SetConfig("BLACKLIST", "/usr/local/etc/havp/blacklist"); +- SetConfig("TEMPLATEPATH", "/usr/local/etc/havp/templates/en"); ++ SetConfig("WHITELIST", "/etc/havp/whitelist"); ++ SetConfig("BLACKLIST", "/etc/havp/blacklist"); ++ SetConfig("TEMPLATEPATH", "/etc/havp/templates/en"); + SetConfig("TEMPDIR", "/var/tmp"); + SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX"); + SetConfig("PIDFILE", "/var/run/havp/havp.pid"); diff --git a/packages/havp/havp-0.86/.mtn2git_empty b/packages/havp/havp-0.86/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/havp/havp-0.86/reconfigure.patch b/packages/havp/havp-0.86/reconfigure.patch new file mode 100644 index 0000000000..6485efaa42 --- /dev/null +++ b/packages/havp/havp-0.86/reconfigure.patch @@ -0,0 +1,164 @@ +Fix templates for autoreconf. Also copy non autoheader generated settings +from default.h.in to defs.h and include that from the autogenerated +default.h - maybe there's some way to stop autoreconf wiping them all out +but I have no idea what that is. This at least makes it all work as +expected. + +Index: havp-0.86/configure.in +=================================================================== +--- havp-0.86.orig/configure.in 2007-03-17 23:34:01.000000000 +1100 ++++ havp-0.86/configure.in 2007-05-16 11:17:27.000000000 +1000 +@@ -9,6 +9,7 @@ + AC_PREFIX_DEFAULT(/usr/local) + + AC_CONFIG_HEADER(havp/default.h) ++AH_BOTTOM([#include "defs.h"]) + + AC_ARG_ENABLE(locking,[ --disable-locking Disable mandatory locking (not needed on Linux/Solaris system)], enable_locking=$enableval, enable_locking=yes) + AC_ARG_ENABLE(ssl-tunnel,[ --enable-ssl-tunnel Enable SSL proxying (not scanned, only forwarded!)], enable_ssl_tunnel=$enableval, enable_ssl_tunnel=no) +@@ -53,7 +54,7 @@ + then + AC_MSG_RESULT([disabled, no dynamic scanning!]) + +- AC_DEFINE(NOMAND) ++ AC_DEFINE(NOMAND, 1, [Enable mandatory locking]) + else + if test "$mandatory" = "yes" + then +@@ -78,7 +79,7 @@ + + if test "$enable_ssl_tunnel" = "yes" + then +- AC_DEFINE(SSLTUNNEL) ++ AC_DEFINE(SSLTUNNEL, 1, [Enable SSL tunnel]) + fi + + AC_MSG_CHECKING(for ClamAV scanner library) +@@ -118,7 +119,7 @@ + LDFLAGS="$LDFLAGS -lclamav" + + SCANNEROBJECTS="clamlibscanner.o" +- AC_DEFINE(USECLAMLIB) ++ AC_DEFINE(USECLAMLIB, 1, [Enable clamav library]) + + AC_MSG_RESULT([found $clamversion in $clamprefix]) + else +@@ -136,7 +137,7 @@ + SCANNEROBJECTS="$SCANNEROBJECTS trophiescanner.o" + LDFLAGS="-L/etc/iscan -lvsapi $LDFLAGS" + +- AC_DEFINE(USETROPHIE) ++ AC_DEFINE(USETROPHIE, 1, [Use Trend Micro scanner]) + else + AC_MSG_RESULT([/etc/iscan/libvsapi.so not found, disabled]) + fi +@@ -151,14 +152,14 @@ + test "$localstatedir" = '${prefix}/var' && localstatedir=/var || localstatedir=$localstatedir + sysconfdir=`eval echo $sysconfdir | $PERL -pe 's#/havp/?$##'` + localstatedir=`eval echo $localstatedir` +-AC_DEFINE_UNQUOTED(CONFIGFILE, "$sysconfdir/havp/havp.config") +-AC_DEFINE_UNQUOTED(WHITELISTFILE, "$sysconfdir/havp/whitelist") +-AC_DEFINE_UNQUOTED(BLACKLISTFILE, "$sysconfdir/havp/blacklist") +-AC_DEFINE_UNQUOTED(TEMPLATEPATH, "$sysconfdir/havp/templates/en") +-AC_DEFINE_UNQUOTED(ACCESSLOG, "$localstatedir/log/havp/access.log") +-AC_DEFINE_UNQUOTED(ERRORLOG, "$localstatedir/log/havp/error.log") +-AC_DEFINE_UNQUOTED(SCANTEMPFILE, "$localstatedir/tmp/havp/havp-XXXXXX") +-AC_DEFINE_UNQUOTED(PIDFILE, "$localstatedir/run/havp/havp.pid") ++AC_DEFINE_UNQUOTED([CONFIGFILE], "$sysconfdir/havp/havp.config", [Config file]) ++AC_DEFINE_UNQUOTED([WHITELISTFILE], "$sysconfdir/havp/whitelist", [Whitelist file]) ++AC_DEFINE_UNQUOTED([BLACKLISTFILE], "$sysconfdir/havp/blacklist", [Blkaclist file]) ++AC_DEFINE_UNQUOTED([TEMPLATEPATH], "$sysconfdir/havp/templates/en", [Template path]) ++AC_DEFINE_UNQUOTED([ACCESSLOG], "$localstatedir/log/havp/access.log", [Access log file]) ++AC_DEFINE_UNQUOTED([ERRORLOG], "$localstatedir/log/havp/error.log", [Error log file]) ++AC_DEFINE_UNQUOTED([SCANTEMPFILE], "$localstatedir/tmp/havp/havp-XXXXXX", [Scanner temp file]) ++AC_DEFINE_UNQUOTED([PIDFILE], "$localstatedir/run/havp/havp.pid", [PID file]) + + AC_SUBST(SCANNEROBJECTS) + AC_SUBST(CFLAGS) +Index: havp-0.86/havp/defs.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ havp-0.86/havp/defs.h 2007-05-16 11:19:59.000000000 +1000 +@@ -0,0 +1,82 @@ ++#define VERSION "0.86" ++ ++//############################################################## ++//Define if you want to rewrite a URL ++//#define REWRITE URLRewrite["havp"]="www.server-side.de"; URLRewrite["www.havp"]="www.server-side.de"; ++ ++//############################################################## ++//Parameters in Configurationfile ++ ++#define CONFIGPARAMS \ ++ "WHITELISTFIRST","TEMPDIR","RANGE","USER","GROUP", \ ++ "SERVERNUMBER","PORT","BIND_ADDRESS","SOURCE_ADDRESS","KEEPBACKBUFFER", \ ++ "KEEPBACKTIME","TRICKLING","MAXSCANSIZE","WHITELIST","BLACKLIST","PIDFILE", \ ++ "DAEMON","TRANSPARENT","LOG_OKS","ACCESSLOG","ERRORLOG","LOGLEVEL", \ ++ "USESYSLOG","SYSLOGNAME","SYSLOGFACILITY","SYSLOGLEVEL","IGNOREVIRUS", \ ++ "DISPLAYINITIALMESSAGES","DBRELOAD","SCANTEMPFILE","TEMPLATEPATH", \ ++ "PARENTPROXY","PARENTPORT","MAXSERVERS","FORWARDED_IP","X_FORWARDED_FOR","FAILSCANERROR", \ ++ "MAXDOWNLOADSIZE","SCANNERTIMEOUT","STREAMUSERAGENT","STREAMSCANSIZE","SCANIMAGES", \ ++ "ENABLECLAMLIB","CLAMDBDIR","CLAMBLOCKBROKEN","CLAMBLOCKMAX","CLAMBLOCKENCRYPTED", \ ++ "CLAMMAXFILES","CLAMMAXFILESIZE","CLAMMAXRECURSION","CLAMMAXRATIO", \ ++ "ENABLEAVG","AVGSERVER","AVGPORT", \ ++ "ENABLEAVESERVER","AVESOCKET", \ ++ "ENABLEFPROT","FPROTSERVER","FPROTPORT", \ ++ "ENABLETROPHIE","TROPHIEMAXFILES","TROPHIEMAXFILESIZE","TROPHIEMAXRATIO", \ ++ "ENABLENOD32","NOD32SOCKET","NOD32VERSION", \ ++ "ENABLECLAMD","CLAMDSOCKET","CLAMDSERVER","CLAMDPORT", \ ++ "ENABLESOPHIE","SOPHIESOCKET", \ ++ "ENABLEAVAST","AVASTSOCKET","AVASTSERVER","AVASTPORT", \ ++ "ENABLEARCAVIR","ARCAVIRSOCKET" ++//SCANNERS ++ ++ ++//############################################################## ++//Configuration not setable in havp.config ++ ++//Time format ++#define TIMEFORMAT "%d/%m/%Y %H:%M:%S " ++ ++//CONNTIMEOUT in seconds ++#define CONNTIMEOUT 60 ++ ++//RECVTIMEOUT in seconds ++#define RECVTIMEOUT 120 ++ ++//SENDTIMEOUT in seconds ++#define SENDTIMEOUT 120 ++ ++//Maximum client connection waiting for accept ++#define MAXCONNECTIONS 1024 ++ ++//Maximum bytes received in one request ++#define MAXRECV 14600 ++ ++//Maximum logfile line length ++#define STRINGLENGTH 1000 ++ ++//Maximum hardlock size - do not change ++#define MAXFILELOCKSIZE 1000000000 ++ ++//Valid Methods ++#define METHODS \ ++ "GET","POST","HEAD","CONNECT","PUT","TRACE","PURGE","OPTIONS","UNLOCK", \ ++ "SEARCH","PROPFIND","BPROPFIND","PROPPATCH","BPROPPATCH","MKCOL","COPY", \ ++ "BCOPY","MOVE","LOCK","BMOVE","DELETE","BDELETE","SUBSCRIBE","UNSUBSCRIBE", \ ++ "POLL","REPORT","ERROR","NONE" ++ ++//Maximum length of SCANTEMPFILE ++#define MAXSCANTEMPFILELENGTH 200 ++ ++//Maximum length of http headers ++#define MAXHTTPHEADERLENGTH 20480 ++ ++// HTML Error String ++#define ERROR_DNS "dns.html" ++#define VIRUS_FOUND "virus.html" ++#define ERROR_SCANNER "scanner.html" ++#define ERROR_DOWN "down.html" ++#define ERROR_INVALID "invalid.html" ++#define ERROR_REQUEST "request.html" ++#define ERROR_BODY "error.html" ++#define ERROR_BLACKLIST "blacklist.html" ++#define ERROR_MAXSIZE "maxsize.html" diff --git a/packages/havp/havp.inc b/packages/havp/havp.inc new file mode 100644 index 0000000000..e0f4849ecf --- /dev/null +++ b/packages/havp/havp.inc @@ -0,0 +1,87 @@ +DESCRIPTION = "HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV \ +anti-virus scanner. The main aims are continuous, non-blocking \ +downloads and smooth scanning of dynamic and password protected HTTP \ +traffic. Havp antivirus proxy has a parent and transparent proxy \ +mode. It can be used with squid or standalone." +HOMEPAGE = "http://www.server-side.de" +SECTION = "network" +LICENSE = "GPLv2" +DEPENDS = "clamav" +RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" + +SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ + file://havp.init \ + file://doc.configure.txt \ + file://volatiles.05_havp" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-scanner=libclamav" + +do_configure_append () { + # Change the paths for /usr/local/etc (patch was applied to change them) + # And enable clamav as the scanner that is to be used. + sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \ + -e 's:/usr/local/etc:/etc:' \ + etc/havp/havp.config > etc/havp/havp.config.oe +} +do_install () { + install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \ + ${D}${sysconfdir}/init.d ${D}${docdir}/havp \ + ${D}${sysconfdir}/default/volatiles + install -m 755 havp/havp ${D}${sbindir} + install -m 755 ${WORKDIR}/havp.init ${D}${sysconfdir}/init.d/havp + install -m 755 INSTALL ${D}${docdir}/havp + install -m 755 ${WORKDIR}/doc.configure.txt ${D}${docdir}/havp/configure.txt + install -m 644 etc/havp/havp.config.oe ${D}${sysconfdir}/havp/havp.config + install -m 644 etc/havp/havp.config.oe ${D}${docdir}/havp/havp.config.default + + for i in whitelist blacklist; do + install -m 644 etc/havp/$i ${D}${sysconfdir}/havp/$i + done + cp -r etc/havp/templates ${D}${sysconfdir}/havp + chmod -R a+rX ${D}${sysconfdir}/havp/templates + + # We need some /var directories + for i in 05_havp; do + install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i + done +} + +PACKAGES = "${PN}-dbg ${PN}-doc \ + ${PN}-templates-br ${PN}-templates-css2 ${PN}-templates-de \ + ${PN}-templates-en ${PN}-templates-es ${PN}-templates-fr \ + ${PN}-templates-it ${PN}-templates-nl ${PN}-templates-pf \ + ${PN}-templates-pl ${PN}-templates-ru ${PN}-templates-sv \ + ${PN}" + +FILES_${PN} = "${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist \ + ${sysconfdir}/havp/havp.config* \ + ${sysconfdir}/init.d ${sysconfdir}/default ${sbindir}/*" +FILES_${PN}-templates-br = "${sysconfdir}/havp/templates/br" +FILES_${PN}-templates-css2 = "${sysconfdir}/havp/templates/css2" +FILES_${PN}-templates-de = "${sysconfdir}/havp/templates/de" +FILES_${PN}-templates-en = "${sysconfdir}/havp/templates/en" +FILES_${PN}-templates-es = "${sysconfdir}/havp/templates/es" +FILES_${PN}-templates-fr = "${sysconfdir}/havp/templates/fr" +FILES_${PN}-templates-it = "${sysconfdir}/havp/templates/it" +FILES_${PN}-templates-nl = "${sysconfdir}/havp/templates/nl" +FILES_${PN}-templates-pf = "${sysconfdir}/havp/templates/pf" +FILES_${PN}-templates-pl = "${sysconfdir}/havp/templates/pl" +FILES_${PN}-templates-ru = "${sysconfdir}/havp/templates/ru" +FILES_${PN}-templates-sv = "${sysconfdir}/havp/templates/sv" + +# Add havp's user and groups +pkg_postinst_${PN} () { + grep -q havp: /etc/group || addgroup havp + grep -q havp: /etc/passwd || \ + adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ + --ingroup havp --no-create-home -g "HAVP" havp + /etc/init.d/populate-volatile.sh update +} + +CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ + ${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist" + +INITSCRIPT_NAME = "havp" +INITSCRIPT_PARAMS = "defaults 55 45" diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb index 9ec5fb5539..447c37b01b 100644 --- a/packages/havp/havp_0.82.bb +++ b/packages/havp/havp_0.82.bb @@ -1,89 +1,5 @@ -DESCRIPTION = "HAVP (HTTP Antivirus Proxy) is a proxy with a ClamAV \ -anti-virus scanner. The main aims are continuous, non-blocking \ -downloads and smooth scanning of dynamic and password protected HTTP \ -traffic. Havp antivirus proxy has a parent and transparent proxy \ -mode. It can be used with squid or standalone." -HOMEPAGE = "http://www.server-side.de" -SECTION = "network" -LICENSE = "GPLv2" -DEPENDS = "clamav" -RDEPENDS_${PN} += "${PN}-templates-css2 ${PN}-templates-en" -PR = "r3" - -SRC_URI = "http://www.server-side.de/download/havp-${PV}.tar.gz \ - file://sysconfdir-is-etc.patch;patch=1 \ - file://havp.init \ - file://doc.configure.txt \ - file://volatiles.05_havp" - -inherit autotools update-rc.d - -EXTRA_OECONF = "--with-scanner=libclamav" - -do_configure_append () { - # Change the paths for /usr/local/etc (patch was applied to change them) - # And enable clamav as the scanner that is to be used. - sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \ - -e 's:/usr/local/etc:/etc:' \ - etc/havp/havp.config > etc/havp/havp.config.oe -} -do_install () { - install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \ - ${D}${sysconfdir}/init.d ${D}${docdir}/havp \ - ${D}${sysconfdir}/default/volatiles - install -m 755 havp/havp ${D}${sbindir} - install -m 755 ${WORKDIR}/havp.init ${D}${sysconfdir}/init.d/havp - install -m 755 INSTALL ${D}${docdir}/havp - install -m 755 ${WORKDIR}/doc.configure.txt ${D}${docdir}/havp/configure.txt - install -m 644 etc/havp/havp.config.oe ${D}${sysconfdir}/havp/havp.config - install -m 644 etc/havp/havp.config.oe ${D}${docdir}/havp/havp.config.default - - for i in whitelist blacklist; do - install -m 644 etc/havp/$i ${D}${sysconfdir}/havp/$i - done - cp -r etc/havp/templates ${D}${sysconfdir}/havp - chmod -R a+rX ${D}${sysconfdir}/havp/templates +require havp.inc - # We need some /var directories - for i in 05_havp; do - install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i - done -} - -PACKAGES = "${PN}-dbg ${PN}-doc \ - ${PN}-templates-br ${PN}-templates-css2 ${PN}-templates-de \ - ${PN}-templates-en ${PN}-templates-es ${PN}-templates-fr \ - ${PN}-templates-it ${PN}-templates-nl ${PN}-templates-pf \ - ${PN}-templates-pl ${PN}-templates-ru ${PN}-templates-sv \ - ${PN}" - -FILES_${PN} = "${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist \ - ${sysconfdir}/havp/havp.config* \ - ${sysconfdir}/init.d ${sysconfdir}/default ${sbindir}/*" -FILES_${PN}-templates-br = "${sysconfdir}/havp/templates/br" -FILES_${PN}-templates-css2 = "${sysconfdir}/havp/templates/css2" -FILES_${PN}-templates-de = "${sysconfdir}/havp/templates/de" -FILES_${PN}-templates-en = "${sysconfdir}/havp/templates/en" -FILES_${PN}-templates-es = "${sysconfdir}/havp/templates/es" -FILES_${PN}-templates-fr = "${sysconfdir}/havp/templates/fr" -FILES_${PN}-templates-it = "${sysconfdir}/havp/templates/it" -FILES_${PN}-templates-nl = "${sysconfdir}/havp/templates/nl" -FILES_${PN}-templates-pf = "${sysconfdir}/havp/templates/pf" -FILES_${PN}-templates-pl = "${sysconfdir}/havp/templates/pl" -FILES_${PN}-templates-ru = "${sysconfdir}/havp/templates/ru" -FILES_${PN}-templates-sv = "${sysconfdir}/havp/templates/sv" - -# Add havp's user and groups -pkg_postinst_${PN} () { - grep -q havp: /etc/group || addgroup havp - grep -q havp: /etc/passwd || \ - adduser --disabled-password --home=${localstatedir}/lib/havp/ --system \ - --ingroup havp --no-create-home -g "HAVP" havp - /etc/init.d/populate-volatile.sh update -} - -CONFFILES_${PN} = "${sysconfdir}/havp/havp.config \ - ${sysconfdir}/havp/blacklist ${sysconfdir}/havp/whitelist" +PR = "r3" -INITSCRIPT_NAME = "havp" -INITSCRIPT_PARAMS = "defaults 55 45" +SRC_URI_append += " file://sysconfdir-is-etc.patch;patch=1" diff --git a/packages/havp/havp_0.86.bb b/packages/havp/havp_0.86.bb new file mode 100644 index 0000000000..c5bb0636bb --- /dev/null +++ b/packages/havp/havp_0.86.bb @@ -0,0 +1,5 @@ +require havp.inc + +PR = "r0" + +SRC_URI_append += " file://reconfigure.patch;patch=1" -- cgit v1.2.3 From 248d56fc941ba762095ec4126c802eb58532d033 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 16 May 2007 03:02:34 +0000 Subject: uclibc 0.9.29: Add machine configuration for the sh4 based titan board. --- packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty | 0 packages/uclibc/uclibc-0.9.29/titan/uClibc.machine | 52 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty create mode 100644 packages/uclibc/uclibc-0.9.29/titan/uClibc.machine (limited to 'packages') diff --git a/packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/titan/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine b/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine new file mode 100644 index 0000000000..75c5328056 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/titan/uClibc.machine @@ -0,0 +1,52 @@ +# +# Automatically generated make config: don't edit +# Wed May 16 12:03:09 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +TARGET_sh=y +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="sh" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_SH2A is not set +# CONFIG_SH2 is not set +# CONFIG_SH3 is not set +CONFIG_SH4=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y -- cgit v1.2.3 From 27b8b3a5bc33b8c6bce70841bf2734c5c18baa9c Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 16 May 2007 04:35:45 +0000 Subject: clamav 0.90.2: Fix build for uclibc by testing for libintl and linking against it if required and added virtual/libintl to DEPENDS to ensure the functionality exists either in libc or via a seperate library. --- .../clamav/clamav-0.90.2/cross-compile-fix.patch | 67 +++++++++++++++++++++- packages/clamav/clamav_0.90.2.bb | 3 +- 2 files changed, 68 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch index 2f346b2f0f..f7ab4aa69f 100644 --- a/packages/clamav/clamav-0.90.2/cross-compile-fix.patch +++ b/packages/clamav/clamav-0.90.2/cross-compile-fix.patch @@ -1,10 +1,12 @@ Add some caching of values which can't be determined when cross-compiling. This lets us define the values via the site files. +Also check for libintl and add it to ldflags if required. + Index: clamav-0.90.2/configure.in =================================================================== --- clamav-0.90.2.orig/configure.in 2007-04-13 09:10:37.000000000 +1000 -+++ clamav-0.90.2/configure.in 2007-05-16 09:33:48.000000000 +1000 ++++ clamav-0.90.2/configure.in 2007-05-16 14:19:01.000000000 +1000 @@ -60,19 +60,21 @@ dnl Check for broken snprintf (code by Phil Oleson ) @@ -66,3 +68,66 @@ Index: clamav-0.90.2/configure.in case "$target_os" in linux*) +@@ -1100,6 +1112,10 @@ + AC_MSG_RESULT($DEFAULT_FD_SETSIZE) + AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value") + ++dnl Do we need to link with -lintl? ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.14.1]) ++ + AC_OUTPUT([ + libclamav/Makefile + clamscan/Makefile +Index: clamav-0.90.2/clamd/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamd/Makefile.am 2007-05-16 14:22:46.000000000 +1000 ++++ clamav-0.90.2/clamd/Makefile.am 2007-05-16 14:23:08.000000000 +1000 +@@ -60,5 +60,5 @@ + + endif + +-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/clamdscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamdscan/Makefile.am 2007-05-16 14:24:02.000000000 +1000 ++++ clamav-0.90.2/clamdscan/Makefile.am 2007-05-16 14:24:18.000000000 +1000 +@@ -40,4 +40,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/clamscan/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/clamscan/Makefile.am 2007-05-16 14:20:23.000000000 +1000 ++++ clamav-0.90.2/clamscan/Makefile.am 2007-05-16 14:20:39.000000000 +1000 +@@ -41,5 +41,5 @@ + treewalk.h + + DEFS = @DEFS@ -DCL_NOTHREADS +-LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LIBINTL@ + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +Index: clamav-0.90.2/freshclam/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/freshclam/Makefile.am 2007-05-16 14:25:10.000000000 +1000 ++++ clamav-0.90.2/freshclam/Makefile.am 2007-05-16 14:25:25.000000000 +1000 +@@ -48,4 +48,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ +Index: clamav-0.90.2/sigtool/Makefile.am +=================================================================== +--- clamav-0.90.2.orig/sigtool/Makefile.am 2007-05-16 14:26:18.000000000 +1000 ++++ clamav-0.90.2/sigtool/Makefile.am 2007-05-16 14:26:29.000000000 +1000 +@@ -39,4 +39,4 @@ + + DEFS = @DEFS@ -DCL_NOTHREADS + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav +-LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ ++LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ @LIBINTL@ diff --git a/packages/clamav/clamav_0.90.2.bb b/packages/clamav/clamav_0.90.2.bb index ab60a66c0a..fe3061606a 100644 --- a/packages/clamav/clamav_0.90.2.bb +++ b/packages/clamav/clamav_0.90.2.bb @@ -1,8 +1,9 @@ require clamav.inc -PR = "r0" +PR = "r1" # 0.9x requires curl for incremental database updates DEPENDS += "curl" +DEPENDS += "virtual/libintl" # Don't check for clamav uid/gid - they don't exist on the host # Put virus definitions in /var/lib not /usr/lib -- cgit v1.2.3 From 59ed852db39b2d4935aaaba6a7bce7fc8fb6abaf Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Wed, 16 May 2007 07:33:45 +0000 Subject: sudo 1.6.8p12: Redo the long long autoconf macros using what is in the current sudo cvs, the previous version wasn't really correct. Should close #1462. --- packages/sudo/files/autofoo.patch | 61 ++++++++++++++++++++++++--------------- packages/sudo/site/.mtn2git_empty | 0 packages/sudo/site/bit-32 | 2 ++ packages/sudo/site/bit-64 | 2 ++ packages/sudo/sudo_1.6.8p12.bb | 8 +++-- 5 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 packages/sudo/site/.mtn2git_empty create mode 100644 packages/sudo/site/bit-32 create mode 100644 packages/sudo/site/bit-64 (limited to 'packages') diff --git a/packages/sudo/files/autofoo.patch b/packages/sudo/files/autofoo.patch index ddfd98b452..4624979bba 100644 --- a/packages/sudo/files/autofoo.patch +++ b/packages/sudo/files/autofoo.patch @@ -1,12 +1,16 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: sudo-1.6.8p6/configure.in +Index: sudo-1.6.8p12/configure.in =================================================================== ---- sudo-1.6.8p6.orig/configure.in 2004-11-25 12:31:20.000000000 -0500 -+++ sudo-1.6.8p6/configure.in 2005-01-21 19:09:27.248233336 -0500 +--- sudo-1.6.8p12.orig/configure.in 2004-11-26 04:31:20.000000000 +1100 ++++ sudo-1.6.8p12/configure.in 2007-05-16 16:45:20.000000000 +1000 +@@ -1670,7 +1670,7 @@ + SUDO_TYPE_INO_T + SUDO_FULL_VOID + SUDO_UID_T_LEN +-SUDO_LONG_LONG ++SUDO_TYPE_LONG_LONG + SUDO_SOCK_SA_LEN + dnl + dnl only set RETSIGTYPE if it is not set already @@ -1700,12 +1700,14 @@ if test -z "$BROKEN_GETCWD"; then AC_REPLACE_FUNCS(getcwd) @@ -23,15 +27,15 @@ Index: sudo-1.6.8p6/configure.in + +AC_CHECK_FUNCS(lsearch, , [AC_CHECK_LIB(compat, lsearch, [AC_CHECK_HEADER(search.h, [AC_DEFINE(HAVE_LSEARCH) LIBS="$LIBS -lcompat"], [AC_LIBOBJ([lsearch])])], [AC_LIBOBJ([lsearch])])]) + -+AC_CHECK_FUNCS(utime, [SUDO_FUNC_UTIME_POSIX], [AC_LIBOBJ([utime])]) ++AC_CHECK_FUNCS(utimes) +SUDO_FUNC_FNMATCH([AC_DEFINE([HAVE_FNMATCH], [1], [Define if you have the 'fnmatch' function.])], [AC_LIBOBJ([fnmatch])]) SUDO_FUNC_ISBLANK AC_REPLACE_FUNCS(strerror strcasecmp sigaction strlcpy strlcat closefrom) AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf, , [NEED_SNPRINTF=1]) -Index: sudo-1.6.8p6/aclocal.m4 +Index: sudo-1.6.8p12/aclocal.m4 =================================================================== ---- sudo-1.6.8p6.orig/aclocal.m4 2004-09-07 13:14:51.000000000 -0400 -+++ sudo-1.6.8p6/aclocal.m4 2005-01-21 19:17:00.029400136 -0500 +--- sudo-1.6.8p12.orig/aclocal.m4 2004-09-08 03:14:51.000000000 +1000 ++++ sudo-1.6.8p12/aclocal.m4 2007-05-16 16:45:08.000000000 +1000 @@ -9,7 +9,7 @@ dnl dnl check for sendmail @@ -171,24 +175,33 @@ Index: sudo-1.6.8p6/aclocal.m4 [AC_REQUIRE([AC_TYPE_UID_T]) AC_MSG_CHECKING(max length of uid_t) AC_CACHE_VAL(sudo_cv_uid_t_len, -@@ -303,15 +303,21 @@ +@@ -301,17 +301,29 @@ + + dnl dnl check for "long long" - dnl XXX hard to cache since it includes 2 tests +-dnl XXX hard to cache since it includes 2 tests dnl -AC_DEFUN(SUDO_LONG_LONG, [AC_MSG_CHECKING(for long long support) -AC_TRY_LINK(, [long long foo = 1000; foo /= 10;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.]) -[AC_TRY_RUN([main() {if (sizeof(long long) == sizeof(long)) exit(0); else exit(1);}], AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]))] -AC_MSG_RESULT(yes), AC_MSG_RESULT(no))]) -+ -+AC_DEFUN([SUDO_LONG_LONG], [AC_MSG_CHECKING(for long long support) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([long long foo = 1000; foo /= 10;]),] -+ [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your compiler supports the "long long" type.]) -+ AC_CHECK_SIZEOF([long]) -+ AC_CHECK_SIZEOF([long long]) -+ if x"$ac_cv_sizeof_long" = x"$ac_cv_sizeof_long_long"; then -+ AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]) -+ fi] -+, AC_MSG_RESULT(yes), AC_MSG_RESULT(no))]) ++AC_DEFUN([SUDO_TYPE_LONG_LONG], ++[AC_CHECK_TYPES(long long, [AC_DEFINE(HAVE_LONG_LONG, 1, [Define if your ++compiler supports the "long long" type.])] ++[AC_MSG_CHECKING(for long and long long equivalence) ++AC_CACHE_VAL(sudo_cv_type_long_is_quad, ++[AC_TRY_RUN([ ++main() { ++if (sizeof(long long) == sizeof(long)) exit(0); ++else exit(1); ++}], [sudo_cv_type_long_is_quad=yes], ++[sudo_cv_type_long_is_quad=no], [sudo_cv_type_long_is_quad=no]) ++rm -f core core.* *.core])dnl ++AC_MSG_RESULT($sudo_cv_type_long_is_quad) ++if test $sudo_cv_type_long_is_quad = yes; then ++ AC_DEFINE(LONG_IS_QUAD, 1, [Define if sizeof(long) == sizeof(long long).]) ++fi ++])]) dnl dnl append a libpath to an LDFLAGS style variable diff --git a/packages/sudo/site/.mtn2git_empty b/packages/sudo/site/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sudo/site/bit-32 b/packages/sudo/site/bit-32 new file mode 100644 index 0000000000..9b7ca5c81b --- /dev/null +++ b/packages/sudo/site/bit-32 @@ -0,0 +1,2 @@ +# is sizeof(long long) == sizeof(long) +sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=no} diff --git a/packages/sudo/site/bit-64 b/packages/sudo/site/bit-64 new file mode 100644 index 0000000000..05846ff0aa --- /dev/null +++ b/packages/sudo/site/bit-64 @@ -0,0 +1,2 @@ +# is sizeof(long long) == sizeof(long) +sudo_cv_type_long_is_quad=${sudo_cv_type_long_is_quad=yes} diff --git a/packages/sudo/sudo_1.6.8p12.bb b/packages/sudo/sudo_1.6.8p12.bb index fa20fc6feb..a2e8f86314 100644 --- a/packages/sudo/sudo_1.6.8p12.bb +++ b/packages/sudo/sudo_1.6.8p12.bb @@ -1,7 +1,9 @@ +PR = "r2" + SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ - file://nonrootinstall.patch;patch=1 \ + file://nonrootinstall.patch;patch=1 \ file://nostrip.patch;patch=1 \ - file://autofoo.patch;patch=1 \ - file://noexec-link.patch;patch=1" + file://autofoo.patch;patch=1 \ + file://noexec-link.patch;patch=1" require sudo.inc -- cgit v1.2.3 From dd8ec56373b37e016b860c12b5b6c7c1a63e2a06 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 May 2007 08:38:49 +0000 Subject: gnome-doc-utils: update to 0.10.3 --- packages/gnome/gnome-doc-utils_0.10.3.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/gnome/gnome-doc-utils_0.10.3.bb (limited to 'packages') diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb new file mode 100644 index 0000000000..e39aa4018b --- /dev/null +++ b/packages/gnome/gnome-doc-utils_0.10.3.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL/LGPL" +DEPENDS = "libxml2 libxslt" + +PR = "r0" + +inherit gnome + +EXTRA_OECONF = "--disable-scrollkeeper" + +FILES_${PN} += "${datadir}/xml*" + +do_stage() { + mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ + autotools_stage_all +} -- cgit v1.2.3 From 8d9def659cb40eefce8f643cc05c6ec35d469d87 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 16 May 2007 08:45:39 +0000 Subject: evince: update to 0.9.0, from poky --- packages/evince/evince_0.9.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/evince/evince_0.9.0.bb (limited to 'packages') diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb new file mode 100644 index 0000000000..40494aa402 --- /dev/null +++ b/packages/evince/evince_0.9.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +RDEPENDS = "espgs " +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r0" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2 \ + file://no-icon-theme.diff;patch=1;pnum=0" + +EXTRA_OECONF = "--without-libgnome --disable-thumbnailer" + -- cgit v1.2.3