|
[-]
[+]
|
Changed |
clamav.changes
|
|
|
|
[-]
[+]
|
Changed |
clamav.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents/Info.plist
^
|
| @@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>BuildMachineOSBuild</key>
- <string>11D50</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>ClamAuth</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.dts.kext.ClamAuth</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>KEXT</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>0.1</string>
- <key>DTCompiler</key>
- <string></string>
- <key>DTPlatformBuild</key>
- <string>4D502</string>
- <key>DTPlatformVersion</key>
- <string>GM</string>
- <key>DTSDKBuild</key>
- <string>11C63</string>
- <key>DTSDKName</key>
- <string>macosx10.7</string>
- <key>DTXcode</key>
- <string>0421</string>
- <key>DTXcodeBuild</key>
- <string>4D502</string>
- <key>OSBundleLibraries</key>
- <dict>
- <key>com.apple.kpi.bsd</key>
- <string>8.0.0</string>
- <key>com.apple.kpi.libkern</key>
- <string>8.0.0</string>
- </dict>
-</dict>
-</plist>
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents/MacOS
^
|
| -(directory)
|
|
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents/MacOS/ClamAuth
^
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents/Resources
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth.kext/Contents/Resources/LICENSE
^
|
| @@ -1,40 +0,0 @@
-Copyright (C) 2011 Sourcefire, Inc., All Rights Reserved.
-
-The KAuth code is based on KauthORama:
-
-Copyright (c) 2007 by Apple Computer, Inc., All Rights Reserved.
-
-Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
- ("Apple") in consideration of your agreement to the following terms, and your
- use, installation, modification or redistribution of this Apple software
- constitutes acceptance of these terms. If you do not agree with these terms,
- please do not use, install, modify or redistribute this Apple software.
-
- In consideration of your agreement to abide by the following terms, and subject
- to these terms, Apple grants you a personal, non-exclusive license, under Apple's
- copyrights in this original Apple software (the "Apple Software"), to use,
- reproduce, modify and redistribute the Apple Software, with or without
- modifications, in source and/or binary forms; provided that if you redistribute
- the Apple Software in its entirety and without modifications, you must retain
- this notice and the following text and disclaimers in all such redistributions of
- the Apple Software. Neither the name, trademarks, service marks or logos of
- Apple Computer, Inc. may be used to endorse or promote products derived from the
- Apple Software without specific prior written permission from Apple. Except as
- expressly stated in this notice, no other rights or licenses, express or implied,
- are granted by Apple herein, including but not limited to any patent rights that
- may be infringed by your derivative works or by other works in which the Apple
- Software may be incorporated.
-
- The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
- COMBINATION WITH YOUR PRODUCTS.
-
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
- OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
- (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth_load
^
|
| @@ -1,4 +0,0 @@
-sudo chown -R root ClamAuth.kext
-sudo chgrp -R wheel ClamAuth.kext
-sudo kextload ClamAuth.kext
-sudo sysctl -w kern.com_apple_dts_kext_ClamAuth="monitor /bin /usr/bin /Applications"
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/ClamAuth_unload
^
|
| @@ -1 +0,0 @@
-sudo kextunload ClamAuth.kext
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/README
^
|
| @@ -1,23 +0,0 @@
-On-access scanning for OS X
----------------------------
-
-The ClamAuth kernel extension enables ClamAV to provide on-access scanning
-for Mac OS X 10.5 and later. The current version works in a passive mode
-only - ClamAV will log the detection but won't block access to the infected
-file. However, it's possible to perform special actions (eg. quarantine
-files) with the VirusEvent directive of clamd.
-
-Usage
------
-
-1. Run ClamAuth_load to load the kernel extension (you can edit the
-script to change or add more paths that will be monitored).
-2. Add "ClamAuth yes" to your clamd.conf
-3. Start clamd with root privileges ('sudo /usr/local/sbin/clamd')
-
-If clamd properly connects to the driver, you should see a line like this
-in the log file:
-
-ClamAuth: Driver version: 0.3, protocol version: 2
-
-ClamAV is now monitoring the paths specified in ClamAuth_load.
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source/ClamAuth.c
^
|
| @@ -1,757 +0,0 @@
-/*
- * Copyright (c) 2007 by Apple Computer, Inc., All Rights Reserved.
- * Copyright (c) 2011 Sourcefire, Inc.
- */
-
-#include <kern/assert.h>
-#include <mach/mach_types.h>
-#include <libkern/libkern.h>
-#include <libkern/OSAtomic.h>
-#include <libkern/OSMalloc.h>
-#include <sys/sysctl.h>
-#include <sys/systm.h>
-#include <sys/kauth.h>
-#include <sys/vnode.h>
-#include <sys/uio.h>
-#include <sys/conf.h>
-#include <miscfs/devfs/devfs.h>
-
-#define CLAMAUTH_VERSION "0.3"
-#define CLAMAUTH_PROTOCOL_VERSION 2
-
-#pragma mark ***** Global Resources
-/* These declarations are required to allocate memory and create locks.
- * They're created when we start and destroyed when we stop.
- */
-
-static OSMallocTag gMallocTag = NULL;
-static lck_grp_t * gLockGroup = NULL;
-
-#define CLAMAUTH_EVENTS (KAUTH_VNODE_EXECUTE)
-
-struct AuthEvent {
- /* don't change the first two fields */
- UInt32 action;
- char path[1024];
- UInt32 pid;
-
-};
-
-#define EVENTQSIZE 64
-
-struct AuthEventQueue {
- struct AuthEvent queue[EVENTQSIZE];
- int cnt, first, last;
-};
-
-void AuthEventInitQueue(struct AuthEventQueue *queue);
-void AuthEventEnqueue(struct AuthEventQueue *queue, struct AuthEvent *event);
-int AuthEventDequeue(struct AuthEventQueue *queue, struct AuthEvent *event);
-
-void AuthEventInitQueue(struct AuthEventQueue *queue)
-{
- memset(queue, 0, sizeof(struct AuthEventQueue));
- queue->first = queue->cnt = 0;
- queue->last = EVENTQSIZE - 1;
-}
-
-void AuthEventEnqueue(struct AuthEventQueue *queue, struct AuthEvent *event)
-{
- queue->last = (queue->last + 1) % EVENTQSIZE;
- memcpy(&queue->queue[queue->last], event, sizeof(struct AuthEvent));
- queue->cnt++;
-}
-
-int AuthEventDequeue(struct AuthEventQueue *queue, struct AuthEvent *event)
-{
- if(!queue->cnt)
- return 1;
- memcpy(event, &queue->queue[queue->first], sizeof(struct AuthEvent));
- queue->first = (queue->first + 1) % EVENTQSIZE;
- queue->cnt--;
- return 0;
-}
-
-struct AuthEventQueue gEventQueue;
-static lck_mtx_t *gEventQueueLock = NULL;
-static SInt32 gEventCount = 0;
-
-#define MAX_PREFIX_NUM 10
-#define MAX_PREFIX_LEN 128
-static char gPrefixTable[MAX_PREFIX_NUM][MAX_PREFIX_LEN];
-static unsigned int gPrefixCount = 0;
-
-static int CreateVnodePath(vnode_t vp, char **vpPathPtr)
- /* Creates a full path for a vnode. vp may be NULL, in which
- * case the returned path is NULL (that is, no memory is allocated).
- * vpPathPtr is a place to store the allocated path buffer.
- * The caller is responsible for freeing this memory using OSFree
- * (the size is always MAXPATHLEN).
- */
-{
- int err;
- int pathLen;
-
- assert( vpPathPtr != NULL);
- assert(*vpPathPtr == NULL);
-
- err = 0;
- if (vp != NULL) {
- *vpPathPtr = OSMalloc(MAXPATHLEN, gMallocTag);
- if (*vpPathPtr == NULL) {
- err = ENOMEM;
- }
- if (err == 0) {
- pathLen = MAXPATHLEN;
- err = vn_getpath(vp, *vpPathPtr, &pathLen);
- }
- }
-
- return err;
-}
-
-/* /dev/clamauth handling */
-
-static int ca_devidx = -1;
-static void *ca_devnode = NULL;
-int dev_open = 0, dev_read = 0;
-
-static int ca_open(dev_t dev, int flag, int devtype, proc_t p)
-{
- if(dev_open)
- return EBUSY;
-
- dev_open = 1;
-
- return 0;
-}
-
-static int ca_close(dev_t dev, int flag, int devtype, proc_t p)
-{
- dev_open = 0;
- return 0;
-}
-
-static int ca_read(dev_t dev, uio_t uio, int ioflag)
-{
- int ret = 0, size, retq = 0;
- struct AuthEvent event;
- struct timespec waittime;
-
- waittime.tv_sec = 1;
- waittime.tv_nsec = 0;
- while(uio_resid(uio) > 0) {
- lck_mtx_lock(gEventQueueLock);
- retq = AuthEventDequeue(&gEventQueue, &event);
- dev_read = 1;
- lck_mtx_unlock(gEventQueueLock);
- if(retq != 1) {
- /* snprintf(info, sizeof(info), "PATH: %s, PID: %d, ACTION: %d\n", event.path, event.pid, event.action); */
- size = MIN(uio_resid(uio), sizeof(event));
- ret = uiomove((const char *) &event, size, uio);
- if(ret)
- break;
- } else {
- //(void) msleep(&gEventQueue, NULL, PUSER, "events", &waittime);
- break;
- }
- }
-
- if(ret) {
- printf("ClamAuth: uiomove() failed\n");
- }
-
- return ret;
-}
-
-static int ca_write(dev_t dev, uio_t uio, int ioflag)
-{
- return EBADF;
-}
-
-static int ca_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, proc_t p)
-{
- return EBADF;
-}
-
-static int ca_select(dev_t dev, int flag, void * wql, proc_t p)
-{
- return EBADF;
-}
-
-static struct cdevsw clamauth_cdevsw = {
- ca_open,
- ca_close,
- ca_read,
- ca_write,
- ca_ioctl,
- eno_stop,
- eno_reset,
- NULL,
- ca_select,
- eno_mmap,
- eno_strat,
- eno_getc,
- eno_putc,
- 0
-};
-
-static int ca_remove(void)
-{
- if(ca_devnode)
- devfs_remove(ca_devnode);
-
- if(ca_devidx != -1) {
- if(cdevsw_remove(ca_devidx, &clamauth_cdevsw) != ca_devidx) {
- printf("ClamAuth: cdevsw_remove() failed\n");
- return KERN_FAILURE;
- }
- }
-
- return KERN_SUCCESS;
-}
-
-
-#pragma mark ***** Listener Resources
-
-/* Some scopes (for example KAUTH_SCOPE_VNODE) are called a /lot/. Thus,
- * it's a good idea to avoid taking mutexes in your listener if at all
- * possible. Thus, we use non-blocking synchronisation to protect the
- * global data that's accessed by our listener (gPrefix).
- * Every time we enter a listener, we increment gActivationCount, and ever
- * time we leave we decrement it. When we want to change the listener, we
- * first remove the listener, then we wait for the activation count to hit,
- * then we can modify the globals protected by that activation count.
- *
- * IMPORTANT:
- * There is still a race condition here. See RemoveListener for a description
- * of the race and why we can't fix it.
- */
-
-static SInt32 gActivationCount = 0;
-
-static int VnodeScopeListener(
- kauth_cred_t credential,
- void * idata,
- kauth_action_t action,
- uintptr_t arg0,
- uintptr_t arg1,
- uintptr_t arg2,
- uintptr_t arg3
-)
- /* A Kauth listener that's called to authorize an action in the vnode scope */
-{
- #pragma unused(credential)
- #pragma unused(idata)
- #pragma unused(arg3)
- int err;
- vfs_context_t context;
- vnode_t vp;
- vnode_t dvp;
- char * vpPath;
- char * dvpPath;
- struct AuthEvent event;
- unsigned int i, mpath = 0;
-
- (void) OSIncrementAtomic(&gActivationCount);
-
- context = (vfs_context_t) arg0;
- vp = (vnode_t) arg1;
- dvp = (vnode_t) arg2;
-
- vpPath = NULL;
- dvpPath = NULL;
-
- /* Convert the vnode, if any, to a path. */
- err = CreateVnodePath(vp, &vpPath);
-
- /* Convert the parent directory vnode, if any, to a path. */
- if (err == 0)
- err = CreateVnodePath(dvp, &dvpPath);
-
- /* Tell the user about this request. Note that we filter requests
- * based on gPrefix. If gPrefix is set, only requests where one
- * of the paths is prefixed by gPrefix will be printed.
- */
- if (err == 0) {
- for(i = 0; i < gPrefixCount; i++) {
- if(vpPath && strprefix(vpPath, gPrefixTable[i])) {
- mpath = 1;
- } else if(dvpPath && strprefix(dvpPath, gPrefixTable[i])) {
- mpath = 1;
- }
- if(mpath)
- break;
- }
-
- if (mpath) {
- if(action & CLAMAUTH_EVENTS)
- printf(
- "scope=" KAUTH_SCOPE_VNODE ", uid=%ld, vp=%s, dvp=%s\n",
- (long) kauth_cred_getuid(vfs_context_ucred(context)),
- (vpPath != NULL) ? vpPath : "<null>",
- (dvpPath != NULL) ? dvpPath : "<null>"
- );
-
- event.pid = vfs_context_pid(context);
- event.action = action;
- if(vpPath) {
- strncpy(event.path, vpPath, sizeof(event.path));
- event.path[sizeof(event.path) - 1] = 0;
- } else {
- event.path[0] = 0;
- }
- lck_mtx_lock(gEventQueueLock);
- if(dev_read && (action & CLAMAUTH_EVENTS)) {
- // printf("gPrefix: %s, vpPath: %s, dvpPath: %s, action: %d\n", gPrefix, vpPath ? vpPath : "<null>", dvpPath ? dvpPath : "<null>", action);
- AuthEventEnqueue(&gEventQueue, &event);
- }
- lck_mtx_unlock(gEventQueueLock);
- (void) OSIncrementAtomic(&gEventCount);
- }
- } else {
- printf("ClamAuth.VnodeScopeListener: Error %d.\n", err);
- }
-
- if (vpPath != NULL) {
- OSFree(vpPath, MAXPATHLEN, gMallocTag);
- }
- if (dvpPath != NULL) {
- OSFree(dvpPath, MAXPATHLEN, gMallocTag);
- }
-
- (void) OSDecrementAtomic(&gActivationCount);
-
- return KAUTH_RESULT_DEFER;
-}
-
-static int FileOpScopeListener(
- kauth_cred_t credential,
- void * idata,
- kauth_action_t action,
- uintptr_t arg0,
- uintptr_t arg1,
- uintptr_t arg2,
- uintptr_t arg3
- )
-/* A Kauth listener that's called to authorize an action in the file operation */
-{
-#pragma unused(credential)
-#pragma unused(idata)
-#pragma unused(arg2)
-#pragma unused(arg3)
- struct AuthEvent event;
- vfs_context_t context;
- const char *path;
- unsigned int i, mpath = 0;
-
- if(!dev_read)
- return KAUTH_RESULT_DEFER;
-
- context = (vfs_context_t) arg0;
- path = (const char *) arg1;
-
- (void) OSIncrementAtomic(&gActivationCount);
-
- switch (action) {
- /* case KAUTH_FILEOP_OPEN: */
- case KAUTH_FILEOP_EXEC:
- for(i = 0; i < gPrefixCount; i++) {
- if(strprefix((const char *) arg1, gPrefixTable[i])) {
- mpath = 1;
- break;
- }
- }
- if(mpath) {
- event.pid = vfs_context_pid(context);
- event.action = action;
- strncpy(event.path, path, sizeof(event.path));
- event.path[sizeof(event.path) - 1] = 0;
- lck_mtx_lock(gEventQueueLock);
- AuthEventEnqueue(&gEventQueue, &event);
- lck_mtx_unlock(gEventQueueLock);
- }
- break;
- default:
- break;
- }
-
- (void) OSDecrementAtomic(&gActivationCount);
-
- return KAUTH_RESULT_DEFER;
-}
-
-#pragma mark ***** Listener Install/Remove
-
-/* gConfigurationLock is a mutex that protects us from two threads trying to
- * simultaneously modify the configuration. The configuration is protect in
- * N ways:
- *
- * o During startup, we register our sysctl OID last, so no one can start
- * modifying the configuration until everything is set up nicely.
- *
- * o During normal operations, the sysctl handler (SysctlHandler) takes
- * the lock to prevent two threads from reconfiguring the system at the
- * same time.
- *
- * o During termination, the stop routine first removes the sysctl OID
- * and then takes the lock before it removes the listener. The first
- * act prevents any new sysctl requests coming it, the second blocks
- * until current sysctl requests are done.
- *
- * IMPORTANT:
- * There is still a race condition here. See the stop routine for a description
- * of the race and why we can't fix it.
- */
-
-static lck_mtx_t * gConfigurationLock = NULL;
-
-/* gListener is our handle to the installed scope listener. We need to
- * keep it around so that we can remove the listener when we're done.
- */
-
-static kauth_listener_t gListener = NULL;
-
-static void RemoveListener(void)
- /* Removes the installed scope listener, if any.
- *
- * Under almost all circumstances this routine runs under the
- * gConfigurationLock. The only time that this might not be the case
- * is when the KEXT's start routine fails prior to gConfigurationLock
- * being created.
- */
-{
- /* First prevent any more threads entering our listener. */
- if (gListener != NULL) {
- kauth_unlisten_scope(gListener);
- gListener = NULL;
- }
-
- /* Then wait for any threads within out listener to stop. Note that there
- * is still a race condition here; there could still be a thread executing
- * between the OSDecrementAtomic and the return from the listener function
- * (for example, FileOpScopeListener). However, there's no way to close
- * this race because of the weak concurrency guarantee for kauth_unlisten_scope.
- * Moreover, the window is very small and, seeing as this only happens during
- * reconfiguration, I'm not too worried. However, I am worried enough
- * to ensure that this loop runs at least once, so we always delay the teardown
- * for at least one second waiting for the threads to drain from our
- * listener.
- */
-
- do {
- struct timespec oneSecond;
-
- oneSecond.tv_sec = 1;
- oneSecond.tv_nsec = 0;
-
- (void) msleep(&gActivationCount, NULL, PUSER, "com_apple_dts_kext_ClamAuth.RemoveListener", &oneSecond);
- } while ( gActivationCount > 0 );
-}
-
-static void InstallListener(void)
- /* Installs a listener for the specified scope. scope and scopeLen specifies
- * the scope to listen for. prefix is a parameter for the scope listener.
- * It may be NULL.
- *
- * prefix points into the gConfiguration global variable, so this routine
- * doesn't make a copy of it. However, it has to make a copy of scope
- * because scope can point to a place in the middle of the gConfiguration
- * variable, so there's no guarantee it's null terminated (which we need it
- * to be in order to call kauth_listen_scope.
- *
- * This routine always runs under the gConfigurationLock.
- */
-{
-
- assert(gListener == NULL);
- //gListener = kauth_listen_scope(KAUTH_SCOPE_VNODE, VnodeScopeListener, NULL);
- gListener = kauth_listen_scope(KAUTH_SCOPE_FILEOP, FileOpScopeListener, NULL);
- if (gListener == NULL) {
- printf("ClamAuth.InstallListener: Could not create gListener.\n");
- RemoveListener();
- } else {
- printf("ClamAuth: Installed file listener\n");
- }
-}
-
-static void ConfigureKauth(const char *configuration)
- /* This routine is called by the sysctl handler when it notices
- * that the configuration has changed. It's responsible for
- * parsing the new configuration string and updating the listener.
- *
- * See SysctlHandler for a description of how I chose to handle the
- * failure case.
- *
- * This routine always runs under the gConfigurationLock.
- */
-{
- unsigned int i = 0;
- assert(configuration != NULL);
-
- /* Remove the existing listener. */
- RemoveListener();
-
- /* Parse the configuration string and install the new listener. */
- if (strcmp(configuration, "remove") == 0) {
- printf("ClamAuth.ConfigureKauth: Removed listener.\n");
- } else if ( strprefix(configuration, "monitor ") ) {
- const char *cursor;
-
- /* Skip the "monitor ". */
- cursor = configuration + strlen("monitor ");
-
- gPrefixCount = 0;
- while(*cursor == ' ')
- cursor++;
-
- if (!*cursor) {
- printf("ClamAuth.ConfigureKauth: Bad configuration '%s'.\n", configuration);
- return;
- }
-
- while(1) {
- if(i < MAX_PREFIX_LEN - 1) {
- if(*cursor == ' ') {
- gPrefixTable[gPrefixCount][i] = 0;
- gPrefixCount++;
- i = 0;
- if(gPrefixCount >= MAX_PREFIX_NUM) {
- printf("ClamAuth.ConfigureKauth: Too many paths (> %u).\n", MAX_PREFIX_NUM);
- gPrefixCount = 0;
- return;
- }
- } else {
- gPrefixTable[gPrefixCount][i++] = *cursor;
- }
- } else {
- printf("ClamAuth.ConfigureKauth: Path too long (%u > %u).\n", i, MAX_PREFIX_LEN);
- gPrefixCount = 0;
- return;
- }
- cursor++;
- if(!*cursor) {
- gPrefixTable[gPrefixCount][i] = 0;
- gPrefixCount++;
- break;
- }
- }
- printf("ClamAuth.ConfigureKauth: Monitoring %u path(s)\n", gPrefixCount);
- InstallListener();
- }
-}
-
-/* gConfiguration holds our current configuration string. It's modified by
- * SysctlHandler (well, by sysctl_handle_string which is called by SysctlHandler).
- */
-
-static char gConfiguration[1024];
-
-
-static int SysctlHandler(
- struct sysctl_oid * oidp,
- void * arg1,
- int arg2,
- struct sysctl_req * req
-)
- /* This routine is called by the kernel when the user reads or
- * writes our sysctl variable. The arguments are standard for
- * a sysctl handler.
- */
-{
- int result;
-
- /* Prevent two threads trying to change our configuration at the same
- * time.
- */
- lck_mtx_lock(gConfigurationLock);
-
- /* Let sysctl_handle_string do all the heavy lifting of getting
- * and setting the variable.
- */
- result = sysctl_handle_string(oidp, arg1, arg2, req);
-
- /* On the way out, if we got no error and a new value was set,
- * do our magic.
- */
- if ( (result == 0) && (req->newptr != 0) ) {
- ConfigureKauth(gConfiguration);
- }
-
- lck_mtx_unlock(gConfigurationLock);
-
- return result;
-}
-
-/* Declare our sysctl OID (that is, a variable that the user can
- * get and set using sysctl). Once this OID is registered (which
- * is done in the start routine, ClamAuth_start, below), the user
- * user can get and set our configuration variable (gConfiguration)
- * using the sysctl command line tool.
- *
- * We use OID using SYSCTL_OID rather than SYSCTL_STRING because
- * we want to override the hander function that's call (we want
- * SysctlHandler rather than sysctl_handle_string).
- */
-
-SYSCTL_OID(
- _kern, /* parent OID */
- OID_AUTO, /* sysctl number, OID_AUTO means we're only accessible by name */
- com_apple_dts_kext_ClamAuth, /* our name */
- CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_KERN, /* we're a string, more or less */
- gConfiguration, /* sysctl_handle_string gets/sets this string */
- sizeof(gConfiguration), /* and this is its maximum length */
- SysctlHandler, /* our handler */
- "A", /* because that's what SYSCTL_STRING does */
- "" /* just a comment */
-);
-
-/* gRegisteredOID tracks whether we've registered our OID or not. */
-
-static boolean_t gRegisteredOID = FALSE;
-
-
-
-#pragma mark ***** Start/Stop
-
-/* Prototypes for our entry points */
-extern kern_return_t com_apple_dts_kext_ClamAuth_start(kmod_info_t * ki, void * d);
-extern kern_return_t com_apple_dts_kext_ClamAuth_stop(kmod_info_t * ki, void * d);
-
-extern kern_return_t com_apple_dts_kext_ClamAuth_start(kmod_info_t * ki, void * d)
-/* Called by the system to start up the kext. */
-{
- #pragma unused(ki)
- #pragma unused(d)
- kern_return_t err;
- struct AuthEvent event;
-
- ca_devidx = cdevsw_add(-1, &clamauth_cdevsw);
- if(ca_devidx == -1) {
- printf("ClamAuth: cdevsw_add() failed\n");
- return KERN_FAILURE;
- }
-
- ca_devnode = devfs_make_node(makedev(ca_devidx, 0), DEVFS_CHAR, UID_ROOT, GID_WHEEL, 0660, "clamauth");
- if(!ca_devnode) {
- printf("ClamAuth: Can't create /dev/clamauth\n");
- return ca_remove();
- }
-
- /* Allocate our global resources, needed in order to allocate memory
- * and locks throughout the rest of the program.
- */
- err = KERN_SUCCESS;
- gMallocTag = OSMalloc_Tagalloc("com.apple.dts.kext.ClamAuth", OSMT_DEFAULT);
- if (gMallocTag == NULL) {
- err = KERN_FAILURE;
- }
- if (err == KERN_SUCCESS) {
- gLockGroup = lck_grp_alloc_init("com.apple.dts.kext.ClamAuth", LCK_GRP_ATTR_NULL);
- if (gLockGroup == NULL) {
- err = KERN_FAILURE;
- }
- }
-
- /* Allocate the lock that protects our configuration. */
- if (err == KERN_SUCCESS) {
- gConfigurationLock = lck_mtx_alloc_init(gLockGroup, LCK_ATTR_NULL);
- if (gConfigurationLock == NULL) {
- err = KERN_FAILURE;
- }
- }
-
- /* Event queue lock */
- if (err == KERN_SUCCESS) {
- gEventQueueLock = lck_mtx_alloc_init(gLockGroup, LCK_ATTR_NULL);
- if (gEventQueueLock == NULL) {
- err = KERN_FAILURE;
- }
- }
- AuthEventInitQueue(&gEventQueue);
-
- /* Initialize event queue and add version info event */
- event.action = CLAMAUTH_PROTOCOL_VERSION;
- strncpy(event.path, "ClamAuth "CLAMAUTH_VERSION"", sizeof(event.path));
- event.pid = 0xdeadbeef;
- AuthEventEnqueue(&gEventQueue, &event);
-
- /* Register our sysctl handler. */
- if (err == KERN_SUCCESS) {
- sysctl_register_oid(&sysctl__kern_com_apple_dts_kext_ClamAuth);
- gRegisteredOID = TRUE;
- }
-
- /* If we failed, shut everything down. */
- if (err != KERN_SUCCESS) {
- printf("ClamAuth_start: Failed to initialize the driver\n");
- (void) com_apple_dts_kext_ClamAuth_stop(ki, d);
- } else
- printf("ClamAuth_start: ClamAV kernel driver loaded\n");
-
- return err;
-}
-
-extern kern_return_t com_apple_dts_kext_ClamAuth_stop(kmod_info_t * ki, void * d)
- /* Called by the system to shut down the kext. */
-{
- #pragma unused(ki)
- #pragma unused(d)
- int ret;
-
- /* Remove our sysctl handler. This prevents more threads entering the
- * handler and trying to change the configuration. There is still a
- * race condition here though. If a thread is already running in our
- * sysctl handler, there's no way to guarantee that it's done before
- * we destroy key resources (notably the gConfigurationLock mutex) that
- * it depends on. That's because sysctl_unregister_oid makes no attempt
- * to wait until all threads running inside the OID handler are done
- * before it returns. I could do stuff to minimise the risk, but there's
- * is no 100% way to close this race so I'm going to ignore it.
- */
- if (gRegisteredOID) {
- sysctl_unregister_oid(&sysctl__kern_com_apple_dts_kext_ClamAuth);
- gRegisteredOID = FALSE;
- }
-
- /* remove the character device */
- ret = ca_remove();
-
- /* Shut down the scope listen, if any. Not that we lock gConfigurationLock
- * because RemoveListener requires it to be locked. Further note that
- * we only do this if the lock has actually been allocated. If the startup
- * routine fails, we can get called with gConfigurationLock set to NULL.
- */
- if (gConfigurationLock != NULL) {
- lck_mtx_lock(gConfigurationLock);
- }
- RemoveListener();
- if (gConfigurationLock != NULL) {
- lck_mtx_unlock(gConfigurationLock);
- }
-
- /* Clean up the configuration lock. */
- if (gConfigurationLock != NULL) {
- lck_mtx_free(gConfigurationLock, gLockGroup);
- gConfigurationLock = NULL;
- }
-
- /* Clean up the event queue lock. */
- if (gEventQueueLock != NULL) {
- lck_mtx_free(gEventQueueLock, gLockGroup);
- gEventQueueLock = NULL;
- }
-
- /* Clean up our global resources. */
- if (gLockGroup != NULL) {
- lck_grp_free(gLockGroup);
- gLockGroup = NULL;
- }
- if (gMallocTag != NULL) {
- OSMalloc_Tagfree(gMallocTag);
- gMallocTag = NULL;
- }
-
- printf("ClamAuth_stop: ClamAV kernel driver removed\n");
- return ret;
-}
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source/ClamAuth.xcodeproj
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source/ClamAuth.xcodeproj/project.pbxproj
^
|
| @@ -1,262 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- 52ADB27A148676E700208F0E /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 52ADB279148676E700208F0E /* LICENSE */; };
- 52ADB28014867AF400208F0E /* ClamAuth.c in Sources */ = {isa = PBXBuildFile; fileRef = 52ADB27F14867AF400208F0E /* ClamAuth.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
- 32A4FEC30562C75700D090E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 32A4FEC40562C75800D090E7 /* ClamAuth.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ClamAuth.kext; sourceTree = BUILT_PRODUCTS_DIR; };
- 52ADB279148676E700208F0E /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
- 52ADB27F14867AF400208F0E /* ClamAuth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ClamAuth.c; sourceTree = "<group>"; };
- E4C7A4390832568C00556BCE /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 32A4FEBF0562C75700D090E7 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 089C166AFE841209C02AAC07 /* KauthORama */ = {
- isa = PBXGroup;
- children = (
- 52ADB27F14867AF400208F0E /* ClamAuth.c */,
- 52ADB279148676E700208F0E /* LICENSE */,
- 32A4FEC30562C75700D090E7 /* Info.plist */,
- E4C7A4390832568C00556BCE /* Kernel.framework */,
- 19C28FB6FE9D52B211CA2CBB /* Products */,
- );
- name = KauthORama;
- sourceTree = "<group>";
- };
- 19C28FB6FE9D52B211CA2CBB /* Products */ = {
- isa = PBXGroup;
- children = (
- 32A4FEC40562C75800D090E7 /* ClamAuth.kext */,
- );
- name = Products;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
- 32A4FEBA0562C75700D090E7 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
- 32A4FEB80562C75700D090E7 /* ClamAuth */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = E40CF0E60890089400F3BED8 /* Build configuration list for PBXNativeTarget "ClamAuth" */;
- buildPhases = (
- 32A4FEB90562C75700D090E7 /* ShellScript */,
- 32A4FEBA0562C75700D090E7 /* Headers */,
- 32A4FEBB0562C75700D090E7 /* Resources */,
- 32A4FEBD0562C75700D090E7 /* Sources */,
- 32A4FEBF0562C75700D090E7 /* Frameworks */,
- 32A4FEC00562C75700D090E7 /* Rez */,
- 32A4FEC10562C75700D090E7 /* ShellScript */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = ClamAuth;
- productInstallPath = "$(SYSTEM_LIBRARY_DIR)/Extensions";
- productName = KauthORama;
- productReference = 32A4FEC40562C75800D090E7 /* ClamAuth.kext */;
- productType = "com.apple.product-type.kernel-extension";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 089C1669FE841209C02AAC07 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 0420;
- };
- buildConfigurationList = E40CF0EA0890089400F3BED8 /* Build configuration list for PBXProject "ClamAuth" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 1;
- knownRegions = (
- en,
- );
- mainGroup = 089C166AFE841209C02AAC07 /* KauthORama */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 32A4FEB80562C75700D090E7 /* ClamAuth */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
- 32A4FEBB0562C75700D090E7 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 52ADB27A148676E700208F0E /* LICENSE in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
- 32A4FEC00562C75700D090E7 /* Rez */ = {
- isa = PBXRezBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
- 32A4FEB90562C75700D090E7 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "script=\"${SYSTEM_DEVELOPER_DIR}/ProjectBuilder Extras/Kernel Extension Support/KEXTPreprocess\";\nif [ -x \"$script\" ]; then\n . \"$script\"\nfi";
- };
- 32A4FEC10562C75700D090E7 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "script=\"${SYSTEM_DEVELOPER_DIR}/ProjectBuilder Extras/Kernel Extension Support/KEXTPostprocess\";\nif [ -x \"$script\" ]; then\n . \"$script\"\nfi";
- };
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 32A4FEBD0562C75700D090E7 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 52ADB28014867AF400208F0E /* ClamAuth.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
- E40CF0E70890089400F3BED8 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- INFOPLIST_FILE = Info.plist;
- MODULE_NAME = com.apple.dts.kext.ClamAuth;
- MODULE_START = com_apple_dts_kext_ClamAuth_start;
- MODULE_STOP = com_apple_dts_kext_ClamAuth_stop;
- MODULE_VERSION = 0.1;
- PRODUCT_NAME = ClamAuth;
- WRAPPER_EXTENSION = kext;
- };
- name = Debug;
- };
- E40CF0E80890089400F3BED8 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- INFOPLIST_FILE = Info.plist;
- MODULE_NAME = com.apple.dts.kext.ClamAuth;
- MODULE_START = com_apple_dts_kext_ClamAuth_start;
- MODULE_STOP = com_apple_dts_kext_ClamAuth_stop;
- MODULE_VERSION = 0.1;
- PRODUCT_NAME = ClamAuth;
- WRAPPER_EXTENSION = kext;
- };
- name = Release;
- };
- E40CF0EB0890089400F3BED8 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_MISSING_PARENTHESES = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- SDKROOT = macosx10.7;
- WARNING_CFLAGS = "-Wall";
- };
- name = Debug;
- };
- E40CF0EC0890089400F3BED8 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
- COPY_PHASE_STRIP = YES;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = s;
- GCC_TREAT_WARNINGS_AS_ERRORS = NO;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_MISSING_PARENTHESES = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.5;
- SDKROOT = macosx10.7;
- WARNING_CFLAGS = "-Wall";
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- E40CF0E60890089400F3BED8 /* Build configuration list for PBXNativeTarget "ClamAuth" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- E40CF0E70890089400F3BED8 /* Debug */,
- E40CF0E80890089400F3BED8 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
- E40CF0EA0890089400F3BED8 /* Build configuration list for PBXProject "ClamAuth" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- E40CF0EB0890089400F3BED8 /* Debug */,
- E40CF0EC0890089400F3BED8 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source/Info.plist
^
|
| @@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>ClamAuth</string>
- <key>CFBundleIconFile</key>
- <string></string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.dts.kext.ClamAuth</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>KEXT</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>$(MODULE_VERSION)</string>
- <key>OSBundleLibraries</key>
- <dict>
- <key>com.apple.kpi.bsd</key>
- <string>8.0.0</string>
- <key>com.apple.kpi.libkern</key>
- <string>8.0.0</string>
- </dict>
-</dict>
-</plist>
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/ClamAuth/source/LICENSE
^
|
| @@ -1,40 +0,0 @@
-Copyright (C) 2011 Sourcefire, Inc., All Rights Reserved.
-
-The KAuth code is based on KauthORama:
-
-Copyright (c) 2007 by Apple Computer, Inc., All Rights Reserved.
-
-Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
- ("Apple") in consideration of your agreement to the following terms, and your
- use, installation, modification or redistribution of this Apple software
- constitutes acceptance of these terms. If you do not agree with these terms,
- please do not use, install, modify or redistribute this Apple software.
-
- In consideration of your agreement to abide by the following terms, and subject
- to these terms, Apple grants you a personal, non-exclusive license, under Apple's
- copyrights in this original Apple software (the "Apple Software"), to use,
- reproduce, modify and redistribute the Apple Software, with or without
- modifications, in source and/or binary forms; provided that if you redistribute
- the Apple Software in its entirety and without modifications, you must retain
- this notice and the following text and disclaimers in all such redistributions of
- the Apple Software. Neither the name, trademarks, service marks or logos of
- Apple Computer, Inc. may be used to endorse or promote products derived from the
- Apple Software without specific prior written permission from Apple. Except as
- expressly stated in this notice, no other rights or licenses, express or implied,
- are granted by Apple herein, including but not limited to any patent rights that
- may be infringed by your derivative works or by other works in which the Apple
- Software may be incorporated.
-
- The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
- COMBINATION WITH YOUR PRODUCTS.
-
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
- OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
- (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/cleanup-partial.pl
^
|
| @@ -1,21 +0,0 @@
-#!/usr/bin/perl
-
-# ---- Settings ----
-# TemporaryDirectory in clamd.conf
-my $TMPDIR='/tmp';
-# How long to wait for next part of RFC1341 message (seconds)
-my $cleanup_interval=3600;
-
-# ---- End of Settings ----
-
-my $partial_dir = "$TMPDIR/clamav-partial";
-# if there is no partial directory, nothing to clean up
-opendir(DIR, $partial_dir) || exit 0;
-
-my $cleanup_threshold = time - $cleanup_interval;
-while(my $file = readdir(DIR)) {
- next unless $file =~ m/^clamav-partial-([0-9]+)_[0-9a-f]{32}-[0-9]+$/;
- my $filetime = $1;
- unlink "$partial_dir/$file" unless $filetime > $cleanup_threshold;
-}
-closedir DIR;
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/safe_clamd
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
clamav-0.97.4.tar.bz2/contrib/safe_clamd/safe_clamd
^
|
| @@ -1,119 +0,0 @@
-#!/bin/sh
-
-# safe_clamd - a script to start clamd and restart if it dies unexpectedly
-# Please report bugs at https://wwws.clamav.net/bugzilla/show_bug.cgi?id=2026
-# Usage:
-# start with ./safe_clamd
-# stop by sending a TERM signal to the safe_clamd process
-
-{
-####################### CONFIGURATION #######################
-# path to clamd.conf
-CLAMDCONF='/usr/local/etc/clamd.conf'
-# path to clamd binary
-CLAMDBIN='/usr/local/sbin/clamd'
-# interval between checks
-SLEEPINTERVAL=3
-# after a successful restart, sleep for $THROTTLE secs before attempting to restart clamd again
-THROTTLE=30
-##################### END CONFIGURATION #####################
-
-# Do not touch anything below this line, unless you know what you are doing
-trap "signalClamd HUP" HUP
-trap "signalClamd TERM" TERM
-trap "signalClamd USR2" USR2
-
-getPid() {
- PIDFILE=`grep ^PidFile $CLAMDCONF | sed -e 's/^PidFile\s*//'`
- if [ -z "$PIDFILE" ]
- then
- # missing PidFile directive
- echo "Please enable the PidFile directive in $CLAMDCONF. See man clamd.conf for more info."
- exit 1
- fi
- CLAMDPID=`cat $PIDFILE 2>/dev/null | grep -Eo '^[0-9]+$'`
- if [ -z "$CLAMDPID" ]
- then
- # empty pidfile
- CLAMDPID=0
- return
- fi
- if ps p $CLAMDPID | grep -v grep | grep $CLAMDBIN > /dev/null
- then
- # good pid
- return
- fi
- # invalid pid
- CLAMDPID=0
-}
-
-startClamd() {
- rm -f $PIDFILE
- if test -f $PIDFILE
- then
- echo "ERROR: cannot remove $PIDFILE"
- exit 1
- else
- $CLAMDBIN $args
- if [ $? -ne 0 ]
- then
- exit $?
- fi
- sleep $THROTTLE
- fi
-}
-
-signalClamd() {
- getPid
- if [ $CLAMDPID -gt 0 ]; then
- echo "Sending $1 to pid $CLAMDPID..."
- kill -$1 $CLAMDPID
- else
- echo "$CLAMDBIN is not running."
- fi
- if [ "$1" == "TERM" ]; then
- echo Exiting $0 ...
- exit
- fi
-}
-
-args=$@
-
-# start clamd
-# if it start successfully, enter loop
-# every 5 secs, find pid, verify it belongs to clamd, kill -0
-# restart it if dead
-while [ true ]; do
- if test -r "$CLAMDCONF"
- then
- if test -x "$CLAMDBIN"
- then
- # retrieve pid
- getPid
- # pid found?
- if [ $CLAMDPID -gt 0 ]
- then
- if kill -0 $CLAMDPID > /dev/null 2>/dev/null
- then
- # pid is alive, sleep before next check
- sleep $SLEEPINTERVAL
- else
- # stale pid
- rm -f $PIDFILE
- startClamd
- fi
- else
- # pid does not belong to clamd
- startClamd
- fi
- else
- echo $CLAMDBIN not found
- exit 1
- fi
- else
- echo $CLAMDCONF not found
- exit 1
- fi
-done
-
-} &
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,29 @@
+Fri Jun 1 13:15:50 EST 2012 (dar)
+---------------------------------
+ * libclamav: Scan output at end of truncated tar (bb#4625)
+
+Wed May 30 17:27:00 EST 2012 (dar)
+----------------------------------
+ * libclamav: Fix handling of tar file with malformed header
+ (bb#4627)
+
+Fri May 25 13:05:40 EST 2012 (dar)
+----------------------------------
+ * libclamav: Scan chm with invalid handling (bb#4626)
+
+Thu May 10 15:45:56 CEST 2012 (tk)
+----------------------------------
+ * freshclam: give custom dbs higher priority during update
+
+Tue May 8 15:31:51 CEST 2012 (acab)
+------------------------------------
+ * libclamav: detect read races and abort the scan with an error
+ (bb#4669)
+
+Tue Apr 10 17:04:20 CEST 2012 (tk)
+----------------------------------
+ * libclamav/pe.c: drop old header check (bb#4699)
+
Wed Mar 14 22:52:48 CET 2012 (tk)
---------------------------------
* V 0.97.4
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/Makefile.am
^
|
| @@ -19,7 +19,7 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 contrib
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
bin_SCRIPTS=clamav-config
@@ -29,7 +29,7 @@
# don't complain that configuration files and databases are not removed, this is intended
distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
DISTCLEANFILES = target.h
-DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes
+DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes
lcov:
($(MAKE); cd unit_tests; $(MAKE) lcov)
quick-check:
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/Makefile.in
^
|
| @@ -344,7 +344,7 @@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
-EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 contrib
+EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
bin_SCRIPTS = clamav-config
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libclamav.pc
@@ -352,7 +352,7 @@
# don't complain that configuration files and databases are not removed, this is intended
distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
DISTCLEANFILES = target.h
-DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-distcheck-werror --enable-all-jit-targets --enable-llvm=yes
+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes
all: clamav-config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/NEWS
^
|
| @@ -1,9 +1,10 @@
-0.97.4
+0.97.5
------
-ClamAV 0.97.4 includes minor bugfixes, detection improvements and initial
-support for on-access scanning under Mac OS X (see contrib/ClamAuth).
-This update is recommended for all users.
+ClamAV 0.97.5 addresses possible evasion cases in some archive formats
+(CVE-2012-1457, CVE-2012-1458, CVE-2012-1459). It also addresses stability
+issues in portions of the bytecode engine. This release is recommended for all
+users.
--
The ClamAV team (http://www.clamav.net/team)
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/README
^
|
| @@ -2,6 +2,17 @@
here may not be available in binary packages.
--
+0.97.5
+------
+
+ClamAV 0.97.5 addresses possible evasion cases in some archive formats
+(CVE-2012-1457, CVE-2012-1458, CVE-2012-1459). It also addresses stability
+issues in portions of the bytecode engine. This release is recommended for all
+users.
+
+--
+The ClamAV team (http://www.clamav.net/team)
+
0.97.4
------
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/aclocal.m4
^
|
| @@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/clamd/server-th.c
^
|
| @@ -452,7 +452,7 @@
closesocket(fds->buf[i].fd);
}
fds_free(fds);
-
+ pthread_mutex_destroy(fds->buf_mutex);
pthread_mutex_lock(&exit_mutex);
progexit = 1;
pthread_mutex_unlock(&exit_mutex);
@@ -1344,6 +1344,8 @@
pthread_join(accept_th, NULL);
fds_free(fds);
+ pthread_mutex_destroy(fds->buf_mutex);
+ pthread_cond_destroy(&acceptdata.cond_nfds);
#ifdef _WIN32
CloseHandle(event_wake_accept);
CloseHandle(event_wake_recv);
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/configure
^
|
| @@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ClamAV 0.97.4.
+# Generated by GNU Autoconf 2.65 for ClamAV 0.97.5.
#
# Report bugs to <http://bugs.clamav.net/>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -359,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -684,7 +684,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -703,8 +703,8 @@
# Identity of this package.
PACKAGE_NAME='ClamAV'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='0.97.4'
-PACKAGE_STRING='ClamAV 0.97.4'
+PACKAGE_VERSION='0.97.5'
+PACKAGE_STRING='ClamAV 0.97.5'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
PACKAGE_URL='http://www.clamav.net/'
@@ -1060,9 +1060,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1107,7 +1106,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1133,7 +1132,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1337,7 +1336,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1353,7 +1352,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1383,8 +1382,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1392,7 +1391,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1410,13 +1409,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1439,7 +1438,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1453,8 +1452,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1469,9 +1468,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1510,11 +1509,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1540,7 +1539,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ClamAV 0.97.4 to adapt to many kinds of systems.
+\`configure' configures ClamAV 0.97.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1554,7 +1553,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1611,7 +1610,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ClamAV 0.97.4:";;
+ short | recursive ) echo "Configuration of ClamAV 0.97.5:";;
esac
cat <<\_ACEOF
@@ -1768,10 +1767,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ClamAV configure 0.97.4
-generated by GNU Autoconf 2.67
+ClamAV configure 0.97.5
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1875,7 +1874,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1918,7 +1917,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1984,7 +1983,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2043,18 +2042,15 @@
} # ac_fn_c_check_func
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
ac_fn_c_check_decl ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- as_decl_name=`echo $2|sed 's/ *(.*//'`
- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2063,12 +2059,8 @@
int
main ()
{
-#ifndef $as_decl_name
-#ifdef __cplusplus
- (void) $as_decl_use;
-#else
- (void) $as_decl_name;
-#endif
+#ifndef $2
+ (void) $2;
#endif
;
@@ -2098,7 +2090,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2151,10 +2143,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2190,7 +2182,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -2213,15 +2205,17 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
+( cat <<\_ASBOX
+## -------------------------------------- ##
## Report this to http://bugs.clamav.net/ ##
-## -------------------------------------- ##"
+## -------------------------------------- ##
+_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2237,8 +2231,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ClamAV $as_me 0.97.4, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2348,9 +2342,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2384,9 +2380,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2399,9 +2397,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2415,9 +2415,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2472,12 +2474,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2492,11 +2489,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+ . "$ac_site_file"
fi
done
@@ -2572,7 +2565,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2589,22 +2582,16 @@
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2623,7 +2610,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -2634,16 +2621,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2668,7 +2655,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2676,7 +2663,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2701,7 +2688,7 @@
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2709,7 +2696,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -3026,11 +3013,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -3052,7 +3039,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -3062,7 +3049,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3300,7 +3287,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3308,7 +3295,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3342,7 +3329,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3358,7 +3345,7 @@
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='0.97.4'
+ VERSION='0.97.5'
# Some tools Automake needs.
@@ -3487,10 +3474,10 @@
$as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h
-VERSION="0.97.4"
+VERSION="0.97.5"
LC_CURRENT=7
-LC_REVISION=13
+LC_REVISION=14
LC_AGE=1
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@ -3553,7 +3540,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3561,7 +3548,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3976,8 +3963,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4091,8 +4078,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4134,8 +4122,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4192,9 +4180,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -4245,8 +4233,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4650,7 +4638,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -4726,7 +4714,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4792,7 +4780,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4859,7 +4847,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -4975,7 +4963,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5177,13 +5165,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5180: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5168: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5183: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5171: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5186: output\"" >&5)
+ (eval echo "\"\$as_me:5174: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6378,7 +6366,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6381 "configure"' > conftest.$ac_ext
+ echo '#line 6369 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7167,7 +7155,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7183,11 +7171,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -7226,7 +7214,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -7242,18 +7230,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -7382,7 +7370,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7905,11 +7894,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7908: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7897: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7912: \$? = $ac_status" >&5
+ echo "$as_me:7901: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8244,11 +8233,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8247: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8236: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8251: \$? = $ac_status" >&5
+ echo "$as_me:8240: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8349,11 +8338,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8356: \$? = $ac_status" >&5
+ echo "$as_me:8345: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8404,11 +8393,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8407: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8411: \$? = $ac_status" >&5
+ echo "$as_me:8400: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10788,7 +10777,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10791 "configure"
+#line 10780 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10884,7 +10873,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10887 "configure"
+#line 10876 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11556,7 +11545,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11559 "configure"
+#line 11548 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11793,7 +11782,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11970,7 +11960,7 @@
if test -n "$with_ltdl_include"; then
if test -f "$with_ltdl_include/ltdl.h"; then :
else
- as_fn_error $? "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5
+ as_fn_error "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5
fi
else
with_ltdl_include=no
@@ -11986,7 +11976,7 @@
if test -n "$with_ltdl_lib"; then
if test -f "$with_ltdl_lib/libltdl.la"; then :
else
- as_fn_error $? "invalid ltdl library directory: \`$with_ltdl_lib'" "$LINENO" 5
+ as_fn_error "invalid ltdl library directory: \`$with_ltdl_lib'" "$LINENO" 5
fi
else
with_ltdl_lib=no
@@ -11995,7 +11985,7 @@
case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
,yes,no,no,)
case $enable_ltdl_convenience in
- no) as_fn_error $? "this package needs a convenience libltdl" "$LINENO" 5 ;;
+ no) as_fn_error "this package needs a convenience libltdl" "$LINENO" 5 ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
@@ -12023,7 +12013,7 @@
LTDLINCL=
;;
,no*,no,*)
- as_fn_error $? "\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" "$LINENO" 5
+ as_fn_error "\`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" "$LINENO" 5
;;
*) with_included_ltdl=no
LIBLTDL="-L$with_ltdl_lib -lltdl"
@@ -12090,7 +12080,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12104,7 +12095,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12121,7 +12113,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12776,8 +12769,8 @@
;; #(
*)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -12933,7 +12926,7 @@
4.1.0*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${gcc_version})" >&5
$as_echo "no (${gcc_version})" >&6; }
- as_fn_error $? "gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" "$LINENO" 5
+ as_fn_error "gcc 4.1.0 is known to incorrectly compile upx.c. Upgrade your compiler to at least 4.1.1/4.1.2)" "$LINENO" 5
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gcc_version})" >&5
@@ -12960,7 +12953,7 @@
if test "x$ac_compiler_gnu" = "xyes"; then
gcc_version=`${CC} -dumpversion`
case "${gcc_version}" in
- 4.[3456789].*)
+ 4.[3456789]*)
distcheck_enable_flags=1
;;
[56789].*)
@@ -13000,7 +12993,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603" "$LINENO" 5
+ as_fn_error "your compiler has gcc PR27603 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27603" "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13039,7 +13032,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" "$LINENO" 5
+ as_fn_error "your compiler has gcc PR26763-2 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26763" "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13117,7 +13110,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" "$LINENO" 5
+ as_fn_error "your compiler has a bug that causes clamav bug no. 670, use a different compiler, see http://bugs.clamav.net/bugzilla/show_bug.cgi?id=670" "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13159,7 +13152,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" "$LINENO" 5
+ as_fn_error "your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045" "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13255,7 +13248,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, bug not present" >&5
$as_echo "ok, bug not present" >&6; }
else
- as_fn_error $? "your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" "$LINENO" 5
+ as_fn_error "your compiler has gcc PR37573 bug, use a lower optimization level (-O1 or -O2), see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37573" "$LINENO" 5
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13340,7 +13333,8 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13399,7 +13393,7 @@
fi
if test x$ac_cv_sizeof_short = x ; then
- as_fn_error $? "cannot determine a size for short" "$LINENO" 5
+ as_fn_error "cannot determine a size for short" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
$as_echo "$ac_cv_sizeof_short" >&6; }
@@ -13439,7 +13433,7 @@
fi
if test x$ac_cv_sizeof_int = x ; then
- as_fn_error $? "cannot determine a size for int" "$LINENO" 5
+ as_fn_error "cannot determine a size for int" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
$as_echo "$ac_cv_sizeof_int" >&6; }
@@ -13479,7 +13473,7 @@
fi
if test x$ac_cv_sizeof_long = x ; then
- as_fn_error $? "cannot determine a size for long" "$LINENO" 5
+ as_fn_error "cannot determine a size for long" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
$as_echo "$ac_cv_sizeof_long" >&6; }
@@ -13519,7 +13513,7 @@
fi
if test x$ac_cv_sizeof_long_long = x ; then
- as_fn_error $? "cannot determine a size for long long" "$LINENO" 5
+ as_fn_error "cannot determine a size for long long" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
$as_echo "$ac_cv_sizeof_long_long" >&6; }
@@ -13559,7 +13553,7 @@
fi
if test x$ac_cv_sizeof_void_p = x ; then
- as_fn_error $? "cannot determine a size for void *" "$LINENO" 5
+ as_fn_error "cannot determine a size for void *" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
$as_echo "$ac_cv_sizeof_void_p" >&6; }
@@ -13728,7 +13722,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -14187,7 +14182,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${acl_cv_prog_gnu_ld+set}" = set; then :
@@ -14777,7 +14772,7 @@
if test "x$CHECK_LIBS" = "x" -a "$enable_check_ut" = "yes"; then
- as_fn_error $? "
+ as_fn_error "
ERROR! Check was configured, but not found. Get it from http://check.sf.net/
" "$LINENO" 5
@@ -14793,10 +14788,10 @@
if test "x$enable_coverage" = "xyes"; then
if test "x$CHECK_LIBS" = "x"; then
- as_fn_error $? "Coverage testing required, but unit tests not enabled!" "$LINENO" 5
+ as_fn_error "Coverage testing required, but unit tests not enabled!" "$LINENO" 5
fi
if test "x$ac_compiler_gnu" != "xyes"; then
- as_fn_error $? "coverage testing only works if gcc is used" "$LINENO" 5
+ as_fn_error "coverage testing only works if gcc is used" "$LINENO" 5
fi
CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
@@ -15008,7 +15003,7 @@
if test ! -f "$ZLIB_HOME/include/zlib.h"
then
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
else
vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
@@ -15018,7 +15013,7 @@
if test -n "$vuln"; then
if test "$zlib_check" = "yes"; then
- as_fn_error $? "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5
+ as_fn_error "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** This ClamAV installation may be linked against" >&5
$as_echo "$as_me: WARNING: ****** This ClamAV installation may be linked against" >&2;}
@@ -15073,7 +15068,7 @@
if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"
else
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -15120,7 +15115,7 @@
LIBS="-lz $LIBS"
else
- as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5
+ as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
fi
LDFLAGS="$save_LDFLAGS"
@@ -15164,7 +15159,7 @@
if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"
else
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -15211,7 +15206,7 @@
LIBS="-lz $LIBS"
else
- as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5
+ as_fn_error "Your zlib is missing gzopen()" "$LINENO" 5
fi
fi
@@ -16311,7 +16306,7 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5
+ as_fn_error "cannot check setpgrp when cross compiling" "$LINENO" 5
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16451,7 +16446,7 @@
;;
no) ;;
- *) as_fn_error $? "--with-system-tommath does not take an argument" "$LINENO" 5 ;;
+ *) as_fn_error "--with-system-tommath does not take an argument" "$LINENO" 5 ;;
esac
fi
@@ -16472,7 +16467,7 @@
withval=$with_iconv;
case "$withval" in
yes|no) wiconv="$withval";;
- *) as_fn_error $? "--with-iconv does not take an argument" "$LINENO" 5 ;;
+ *) as_fn_error "--with-iconv does not take an argument" "$LINENO" 5;;
esac
else
wiconv=auto
@@ -17193,7 +17188,7 @@
CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"
else
- as_fn_error $? "Cannot find libmilter" "$LINENO" 5
+ as_fn_error "Cannot find libmilter" "$LINENO" 5
fi
@@ -17211,7 +17206,7 @@
have_milter="yes"
else
- as_fn_error $? "Please install mfapi.h from the sendmail distribution" "$LINENO" 5
+ as_fn_error "Please install mfapi.h from the sendmail distribution" "$LINENO" 5
fi
@@ -17244,7 +17239,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17570,7 +17566,7 @@
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
+ as_fn_error "User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, user $clamav_user and group $clamav_group" >&5
$as_echo "yes, user $clamav_user and group $clamav_group" >&6; }
@@ -17624,8 +17620,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17663,8 +17659,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17725,7 +17721,7 @@
$as_echo "$have_cv_attrib_aligned" >&6; }
if test "$have_cv_attrib_packed" = no -a "$have_cv_pragma_pack" = no -a "$have_cv_pragma_pack_hpux" = no; then
- as_fn_error $? "Need to know how to pack structures with this compiler" "$LINENO" 5
+ as_fn_error "Need to know how to pack structures with this compiler" "$LINENO" 5
fi
if test "$have_cv_attrib_packed" = yes; then
@@ -17813,7 +17809,7 @@
$as_echo "$have_cv_struct_pack" >&6; }
if test "$have_cv_struct_pack" = "no"; then
- as_fn_error $? "Structure packing seems to be available, but is not working with this compiler" "$LINENO" 5
+ as_fn_error "Structure packing seems to be available, but is not working with this compiler" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set" >&5
@@ -17950,7 +17946,8 @@
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -19975,7 +19972,7 @@
fi
if test "x$CURSES_LIBS" = "x" -a "$enable_clamdtop" = "yes"; then
- as_fn_error $? "
+ as_fn_error "
ERROR! Clamdtop was configured, but not found. You need to install libncurses5-dev.
" "$LINENO" 5
@@ -20014,7 +20011,7 @@
# configure think that -lm doesn't have cos, hence its in libc).
if test "x$enable_distcheckwerror" = "xyes"; then
if test "$distcheck_enable_flags" = "1"; then
- CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
+ CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Wno-error=strict-aliasing -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
fi
fi
@@ -20138,7 +20135,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -20162,19 +20158,19 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
+ as_fn_error "conditional \"INSTALL_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"CONVENIENCE_LTDL\" was never defined.
+ as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
LT_CONFIG_H=clamav-config.h
@@ -20196,39 +20192,39 @@
if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
- as_fn_error $? "conditional \"VERSIONSCRIPT\" was never defined.
+ as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBCHECK\" was never defined.
+ as_fn_error "conditional \"HAVE_LIBCHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_COVERAGE\" was never defined.
+ as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.
+ as_fn_error "conditional \"ENABLE_UNRAR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
- as_fn_error $? "conditional \"LINK_TOMMATH\" was never defined.
+ as_fn_error "conditional \"LINK_TOMMATH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined.
+ as_fn_error "conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MILTER\" was never defined.
+ as_fn_error "conditional \"HAVE_MILTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
+ as_fn_error "conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -20378,19 +20374,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -20586,7 +20582,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -20639,8 +20635,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ClamAV $as_me 0.97.4, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20706,11 +20702,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status 0.97.4
-configured by $0, generated by GNU Autoconf 2.67,
+ClamAV config.status 0.97.5
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -20728,16 +20724,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -20759,7 +20750,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -20772,7 +20762,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -20781,7 +20771,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -21125,7 +21115,7 @@
"docs/man/sigtool.1") CONFIG_FILES="$CONFIG_FILES docs/man/sigtool.1" ;;
"docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -21163,7 +21153,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -21180,7 +21170,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -21194,18 +21184,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -21294,28 +21284,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -21343,7 +21325,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -21428,7 +21410,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -21441,7 +21423,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -21469,7 +21451,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -21496,7 +21478,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -21633,22 +21615,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -21659,19 +21641,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -22456,7 +22438,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -22477,7 +22459,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
@@ -22634,7 +22616,7 @@
if test "$enable_llvm" = "yes" && test "$subdirfailed" != "no"; then
- as_fn_error $? "Failed to configure LLVM, and LLVM was explicitly requested" "$LINENO" 5
+ as_fn_error "Failed to configure LLVM, and LLVM was explicitly requested" "$LINENO" 5
fi
if test "$subdirfailed" != "yes" && test "$enable_llvm" != "no"; then
ENABLE_LLVM_TRUE=
@@ -22730,7 +22712,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -22754,19 +22735,19 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"INSTALL_LTDL\" was never defined.
+ as_fn_error "conditional \"INSTALL_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
- as_fn_error $? "conditional \"CONVENIENCE_LTDL\" was never defined.
+ as_fn_error "conditional \"CONVENIENCE_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
LT_CONFIG_H=clamav-config.h
@@ -22788,47 +22769,47 @@
if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
- as_fn_error $? "conditional \"VERSIONSCRIPT\" was never defined.
+ as_fn_error "conditional \"VERSIONSCRIPT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBCHECK_TRUE}" && test -z "${HAVE_LIBCHECK_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_LIBCHECK\" was never defined.
+ as_fn_error "conditional \"HAVE_LIBCHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_COVERAGE\" was never defined.
+ as_fn_error "conditional \"ENABLE_COVERAGE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.
+ as_fn_error "conditional \"ENABLE_UNRAR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINK_TOMMATH_TRUE}" && test -z "${LINK_TOMMATH_FALSE}"; then
- as_fn_error $? "conditional \"LINK_TOMMATH\" was never defined.
+ as_fn_error "conditional \"LINK_TOMMATH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_CLAMD\" was never defined.
+ as_fn_error "conditional \"BUILD_CLAMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_MILTER_TRUE}" && test -z "${HAVE_MILTER_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MILTER\" was never defined.
+ as_fn_error "conditional \"HAVE_MILTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
+ as_fn_error "conditional \"HAVE_CURSES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
- as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
+ as_fn_error "conditional \"am__EXEEXT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_LLVM_TRUE}" && test -z "${ENABLE_LLVM_FALSE}"; then
- as_fn_error $? "conditional \"ENABLE_LLVM\" was never defined.
+ as_fn_error "conditional \"ENABLE_LLVM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -22978,19 +22959,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -23186,7 +23167,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -23239,8 +23220,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ClamAV $as_me 0.97.4, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by ClamAV $as_me 0.97.5, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -23306,11 +23287,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ClamAV config.status 0.97.4
-configured by $0, generated by GNU Autoconf 2.67,
+ClamAV config.status 0.97.5
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -23328,16 +23309,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -23359,7 +23335,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -23372,7 +23347,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -23381,7 +23356,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -23727,7 +23702,7 @@
"docs/man/clamdtop.1") CONFIG_FILES="$CONFIG_FILES docs/man/clamdtop.1" ;;
"libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -23765,7 +23740,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -23782,7 +23757,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -23796,18 +23771,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -23896,28 +23871,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -23945,7 +23912,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -24030,7 +23997,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -24043,7 +24010,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -24071,7 +24038,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -24098,7 +24065,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -24235,22 +24202,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -24261,19 +24228,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -25058,7 +25025,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -25079,7 +25046,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/configure.in
^
|
| @@ -20,7 +20,7 @@
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([ClamAV], [0.97.4], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
+AC_INIT([ClamAV], [0.97.5], [http://bugs.clamav.net/], [clamav], [http://www.clamav.net/])
AH_BOTTOM([#include "platform.h"])
dnl put configure auxiliary into config
@@ -43,10 +43,10 @@
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
-VERSION="0.97.4"
+VERSION="0.97.5"
LC_CURRENT=7
-LC_REVISION=13
+LC_REVISION=14
LC_AGE=1
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
@@ -120,7 +120,7 @@
if test "x$ac_compiler_gnu" = "xyes"; then
gcc_version=`${CC} -dumpversion`
case "${gcc_version}" in
- 4.[[3456789]].*)
+ 4.[[3456789]]*)
distcheck_enable_flags=1
;;
[[56789]].*)
@@ -1600,7 +1600,7 @@
# configure think that -lm doesn't have cos, hence its in libc).
if test "x$enable_distcheckwerror" = "xyes"; then
if test "$distcheck_enable_flags" = "1"; then
- CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
+ CFLAGS="$CFLAGS -Wno-pointer-sign -Werror-implicit-function-declaration -Wno-error=strict-aliasing -Werror -Wextra -Wall -Wno-error=bad-function-cast -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-but-set-variable -Wno-error=unused-function -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"
fi
fi
|
|
|
Deleted |
clamav-0.97.5.tar.bz2/database/daily.cvd
^
|
|
|
Deleted |
clamav-0.97.5.tar.bz2/database/main.cvd
^
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/docs/man/clamdscan.1.in
^
|
| @@ -78,7 +78,8 @@
.TP
(4) To scan from standard input:
-\fBclamdscan \- <file_to_scan\fR
+\fBclamdscan \- < file_to_scan\fR
+
\fBcat file_to_scan | clamdscan \-\fR
.SH "RETURN CODES"
.LP
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/freshclam/manager.c
^
|
| @@ -1316,7 +1316,7 @@
char cwd[512], info[32], buff[513], *pt;
struct dirent *dent;
int fd, err = 0;
- gzFile *gzs = NULL;
+ gzFile gzs = NULL;
if(!getcwd(cwd, sizeof(cwd))) {
logg("!buildcld: Can't get path of current working directory\n");
@@ -2182,6 +2182,15 @@
logg("*Using IPv6 aware code\n");
#endif
+ /* custom dbs */
+ if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {
+ while(opt) {
+ if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)
+ updated = 1;
+ opt = opt->nextarg;
+ }
+ }
+
#ifdef HAVE_RESOLV_H
dnsdbinfo = optget(opts, "DNSDatabaseInfo")->strarg;
@@ -2363,15 +2372,6 @@
mirman_write("mirrors.dat", dbdir, &mdat);
mirman_free(&mdat);
- /* custom dbs */
- if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {
- while(opt) {
- if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)
- updated = 1;
- opt = opt->nextarg;
- }
- }
-
cli_rmdirs(updtmpdir);
if(checkdbdir() < 0) {
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/c++/Makefile.am
^
|
| @@ -603,7 +603,7 @@
endif
# rm configure generated files
dist-hook: clean-local
- make -C llvm dist-hook
+ $(MAKE) -C llvm dist-hook
rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/c++/Makefile.in
^
|
| @@ -6292,7 +6292,7 @@
# rm configure generated files
dist-hook: clean-local
- make -C llvm dist-hook
+ $(MAKE) -C llvm dist-hook
rm -f $(distdir)/llvm/include/llvm/Config/*.h $(distdir)/llvm/include/llvm/Config/*.def $(distdir)/llvm/Makefile.config $(distdir)/llvm/llvm.spec
rm -f $(distdir)/llvm/docs/doxygen.cfg $(distdir)/llvm/tools/llvmc/plugins/Base/Base.td $(distdir)/llvm/tools/llvm-config/llvm-config.in
rm -f $(distdir)/llvm/include/llvm/System/DataTypes.h $(distdir)/llvm/config.log $(distdir)/llvm/config.status
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/c++/aclocal.m4
^
|
| @@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/c++/configure
^
|
| @@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libclamavc++ devel.
+# Generated by GNU Autoconf 2.65 for libclamavc++ devel.
#
# Report bugs to <http://bugs.clamav.net>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -359,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -682,7 +682,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -979,9 +979,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1026,7 +1025,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1052,7 +1051,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1256,7 +1255,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1272,7 +1271,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1302,8 +1301,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1311,7 +1310,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1329,13 +1328,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1358,7 +1357,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1372,8 +1371,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1388,9 +1387,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1429,11 +1428,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1473,7 +1472,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1643,9 +1642,9 @@
if $ac_init_version; then
cat <<\_ACEOF
libclamavc++ configure devel
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1795,7 +1794,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1820,7 +1819,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1896,7 +1895,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1976,7 +1975,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
+ test $ac_status = 0; } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -2084,7 +2083,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by libclamavc++ $as_me devel, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2194,9 +2193,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2230,9 +2231,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -2245,9 +2248,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -2261,9 +2266,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -2318,12 +2325,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2338,11 +2340,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+ . "$ac_site_file"
fi
done
@@ -2418,7 +2416,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2433,22 +2431,16 @@
ac_aux_dir=
for ac_dir in config "$srcdir"/config; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2466,7 +2458,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -2477,16 +2469,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -2511,7 +2503,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -2519,7 +2511,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -2544,7 +2536,7 @@
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
fi
fi
@@ -2552,7 +2544,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2680,11 +2672,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2706,7 +2698,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2716,7 +2708,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2954,7 +2946,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2962,7 +2954,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2996,7 +2988,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3361,8 +3353,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C++ compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3404,8 +3397,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3462,9 +3455,9 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
+as_fn_error "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
@@ -3515,8 +3508,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4134,8 +4127,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4544,7 +4537,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4560,11 +4553,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -4603,7 +4596,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4619,18 +4612,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -4691,7 +4684,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4757,7 +4750,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4889,7 +4882,8 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -5119,8 +5113,8 @@
;; #(
*)
- as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
@@ -5241,7 +5235,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -5320,7 +5314,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -5436,7 +5430,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5638,13 +5632,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5641: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5635: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5644: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5638: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5647: output\"" >&5)
+ (eval echo "\"\$as_me:5641: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6849,7 +6843,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6852 "configure"' > conftest.$ac_ext
+ echo '#line 6846 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8036,7 +8030,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8052,11 +8046,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -8095,7 +8089,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -8111,11 +8105,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
@@ -8637,11 +8631,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8640: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8644: \$? = $ac_status" >&5
+ echo "$as_me:8638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8976,11 +8970,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8979: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8973: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8983: \$? = $ac_status" >&5
+ echo "$as_me:8977: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9081,11 +9075,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9084: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9078: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9088: \$? = $ac_status" >&5
+ echo "$as_me:9082: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9136,11 +9130,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9139: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9133: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9143: \$? = $ac_status" >&5
+ echo "$as_me:9137: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11520,7 +11514,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11523 "configure"
+#line 11517 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11616,7 +11610,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11619 "configure"
+#line 11613 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12031,7 +12025,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -13572,11 +13566,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13575: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13569: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13579: \$? = $ac_status" >&5
+ echo "$as_me:13573: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13671,11 +13665,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13674: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13678: \$? = $ac_status" >&5
+ echo "$as_me:13672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13723,11 +13717,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13726: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13720: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13730: \$? = $ac_status" >&5
+ echo "$as_me:13724: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14691,7 +14685,7 @@
if test "$GXX" != "yes"; then
- as_fn_error $? "GNU C++ compiler not found, not building LLVM" "$LINENO" 5
+ as_fn_error "GNU C++ compiler not found, not building LLVM" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
@@ -14729,14 +14723,14 @@
if test "${with_system_llvm+set}" = set; then :
withval=$with_system_llvm; case "$withval" in
yes)
- as_fn_error $? "--with-system-llvm needs full path to llvm-config" "$LINENO" 5
+ as_fn_error "--with-system-llvm needs full path to llvm-config" "$LINENO" 5
;;
no) ;;
*)
llvmconfig="$withval"
llvmver=`$llvmconfig --version`
if test "$llvmver" != "2.9"; then
- as_fn_error $? "LLVM 2.9 required, but \"$llvmver\" found" "$LINENO" 5
+ as_fn_error "LLVM 2.9 required, but \"$llvmver\" found" "$LINENO" 5
fi
LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`
@@ -14814,13 +14808,13 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported C++ compiler version" >&5
$as_echo_n "checking for supported C++ compiler version... " >&6; }
gxx_version=`${CXX} -dumpversion` ||
- as_fn_error $? "Unable to get GNU C++ compiler version" "$LINENO" 5
+ as_fn_error "Unable to get GNU C++ compiler version" "$LINENO" 5
case "${gxx_version}" in
[03].*)
- as_fn_error $? "C++ compiler too old (${gxx_version})" "$LINENO" 5
+ as_fn_error "C++ compiler too old (${gxx_version})" "$LINENO" 5
;;
4.1.[1]*)
- as_fn_error $? "C++ compiler is buggy" "$LINENO" 5
+ as_fn_error "C++ compiler is buggy" "$LINENO" 5
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${gxx_version})" >&5
@@ -14837,15 +14831,15 @@
$as_echo "ok ($target_cpu-$target_os)" >&6; }
;;
*)
- as_fn_error $? "OS $target_os is not supported, not building LLVM" "$LINENO" 5
+ as_fn_error "OS $target_os is not supported, not building LLVM" "$LINENO" 5
;;
esac
;;
alpha*|arm*)
- as_fn_error $? "CPU support is untested, not building LLVM" "$LINENO" 5
+ as_fn_error "CPU support is untested, not building LLVM" "$LINENO" 5
;;
*)
- as_fn_error $? "Unsupported CPU for JIT: $target_cpu, not building LLVM" "$LINENO" 5
+ as_fn_error "Unsupported CPU for JIT: $target_cpu, not building LLVM" "$LINENO" 5
;;
esac
fi
@@ -14877,8 +14871,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f core conftest.err conftest.$ac_objext \
@@ -14902,8 +14896,8 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "failed
+See \`config.log' for more details." "$LINENO" 5; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -15080,7 +15074,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -15104,40 +15097,40 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
+ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DEBUG_BUILD_TRUE}" && test -z "${DEBUG_BUILD_FALSE}"; then
- as_fn_error $? "conditional \"DEBUG_BUILD\" was never defined.
+ as_fn_error "conditional \"DEBUG_BUILD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_X86_TRUE}" && test -z "${BUILD_X86_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_X86\" was never defined.
+ as_fn_error "conditional \"BUILD_X86\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_PPC_TRUE}" && test -z "${BUILD_PPC_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_PPC\" was never defined.
+ as_fn_error "conditional \"BUILD_PPC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_EXTERNAL_LLVM_TRUE}" && test -z "${BUILD_EXTERNAL_LLVM_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_EXTERNAL_LLVM\" was never defined.
+ as_fn_error "conditional \"BUILD_EXTERNAL_LLVM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -15287,19 +15280,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -15495,7 +15488,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -15549,7 +15542,7 @@
# values after options handling.
ac_log="
This file was extended by libclamavc++ $as_me devel, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -15615,10 +15608,10 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libclamavc++ config.status devel
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -15636,16 +15629,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -15667,7 +15655,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -15680,7 +15667,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
+ as_fn_error "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -15689,7 +15676,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -16099,7 +16086,7 @@
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -16137,7 +16124,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -16154,7 +16141,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -16168,18 +16155,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16268,28 +16255,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -16317,7 +16296,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -16402,7 +16381,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -16415,7 +16394,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -16443,7 +16422,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -16470,7 +16449,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -16607,22 +16586,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -16633,19 +16612,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error $? "could not create -" "$LINENO" 5
+ || as_fn_error "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -17597,7 +17576,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -17618,7 +17597,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
#
@@ -17759,7 +17738,7 @@
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
+ as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
fi
cd "$ac_popdir"
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
^
|
| @@ -19,6 +19,9 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/System/DynamicLibrary.h"
#include "llvm/Config/config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
using namespace llvm;
// AtExitHandlers - List of functions to call when the program exits,
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/cache.c
^
|
| @@ -706,7 +706,7 @@
void *buf;
size_t readme = todo < FILEBUFF ? todo : FILEBUFF;
if(!(buf = fmap_need_off_once(map, at, readme)))
- return CL_VIRUS;
+ return CL_EREAD;
todo -= readme;
at += readme;
cli_md5_update(&md5, buf, readme);
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/cvd.c
^
|
| @@ -54,7 +54,7 @@
unsigned int size, pathlen = strlen(destdir) + 100 + 5;
FILE *outfile = NULL;
struct stat foo;
- gzFile *infile;
+ gzFile infile;
cli_dbgmsg("in cli_untgz()\n");
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/cvd.h
^
|
| @@ -28,7 +28,7 @@
#include "sha256.h"
struct cli_dbio {
- gzFile *gzs;
+ gzFile gzs;
FILE *fs;
unsigned int size, bread;
char *buf, *bufpt, *readpt;
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/filetypes.c
^
|
| @@ -213,6 +213,8 @@
if((encoding = encoding_detect_bom(buff, bread))) {
unsigned char decodedbuff[(MAGIC_BUFFER_SIZE+1)*2];
m_area_t in_area, out_area;
+
+ memset(decodedbuff, 0, sizeof(decodedbuff));
in_area.buffer = (unsigned char *) buff;
in_area.length = bread;
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/htmlnorm.c
^
|
| @@ -479,7 +479,7 @@
if (mbchar && (c < 0x80 || mbchar >= 0x10000)) {
if (mbchar == 0xE38082 || mbchar == 0xEFBC8E
|| mbchar == 0xEFB992 ||
- mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F)) {
+ (mbchar == 0xA1 && (c == 0x43 || c == 0x44 || c == 0x4F))) {
cont->contents[i++] = '.';
if (mbchar == 0xA1) {
--i;
@@ -786,7 +786,7 @@
if (*ptr < 0x80 || mbchar >= 0x10000) {
if (mbchar == 0xE38082 || mbchar == 0xEFBC8E
|| mbchar == 0xEFB992 ||
- mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {
+ (mbchar == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {
/* bb #4097 */
html_output_c(file_buff_o2, '.');
html_output_c(file_buff_text, '.');
@@ -1084,7 +1084,7 @@
if (mbchar2 && (*ptr < 0x80 || mbchar2 >= 0x10000)) {
if (mbchar2 == 0xE38082 || mbchar2 == 0xEFBC8E
|| mbchar2 == 0xEFB992 ||
- mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F)) {
+ (mbchar2 == 0xA1 && (*ptr == 0x43 || *ptr == 0x44 || *ptr == 0x4F))) {
html_output_c(file_buff_o2, '.');
if (tag_val_length < HTML_STR_LENGTH)
tag_val[tag_val_length++] = '.';
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/mspack.c
^
|
| @@ -1101,7 +1101,7 @@
unsigned char *i_ptr, *i_end;
int match_length, length_footer, extra, verbatim_bits, bytes_todo;
- int this_run, main_element, aligned_bits, j, ret;
+ int this_run, main_element, aligned_bits, j, ret, warned=0;
unsigned char *window, *runsrc, *rundest, buf[12];
unsigned int frame_size=0, end_frame, match_offset, window_posn;
unsigned int R0, R1, R2;
@@ -1132,17 +1132,27 @@
R2 = lzx->R2;
end_frame = (unsigned int)((lzx->offset + out_bytes) / LZX_FRAME_SIZE) + 1;
+ cli_dbgmsg("lzx_decompress: end frame = %u\n", end_frame);
while (lzx->frame < end_frame) {
+ cli_dbgmsg("lzx_decompress: current frame = %u\n", lzx->frame);
/* have we reached the reset interval? (if there is one?) */
if (lzx->reset_interval && ((lzx->frame % lzx->reset_interval) == 0)) {
if (lzx->block_remaining) {
- cli_dbgmsg("lzx_decompress: %d bytes remaining at reset interval\n", lzx->block_remaining);
- return lzx->error = CL_EFORMAT;
+ /* this is a file format error, but we need to extract what we can and scan that */
+ cli_dbgmsg("lzx_decompress: %d bytes remaining at reset interval\n", lzx->block_remaining);
+ if (!warned) {
+ cli_dbgmsg("Detected an invalid reset interval during decompression.\n");
+ warned++;
+ }
+ if (!lzx->header_read) {
+ /* cannot continue if no header at all */
+ return lzx->error = CL_EFORMAT;
+ }
+ } else {
+ /* re-read the intel header and reset the huffman lengths */
+ lzx_reset_state(lzx);
}
-
- /* re-read the intel header and reset the huffman lengths */
- lzx_reset_state(lzx);
}
/* read header if necessary */
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/others.h
^
|
| @@ -53,7 +53,7 @@
* in re-enabling affected modules.
*/
-#define CL_FLEVEL 64
+#define CL_FLEVEL 65
#define CL_FLEVEL_DCONF CL_FLEVEL
#define CL_FLEVEL_SIGTOOL CL_FLEVEL
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/pe.c
^
|
| @@ -738,22 +738,6 @@
return CL_CLEAN;
}
pe_plus = 1;
- } else {
- /*
- either it's got a PE32_SIGNATURE or
- we enable win9x compatibility in that we don't honor magic (see bb#119)
- either way it's a 32bit thingy
- */
- if(EC16(optional_hdr32.Magic) != PE32_SIGNATURE) {
- if(!ctx->corrupted_input)
- cli_warnmsg("Incorrect magic number in optional header\n");
- if(DETECT_BROKEN_PE) {
- if(ctx->virname)
- *ctx->virname = "Heuristics.Broken.Executable";
- return CL_VIRUS;
- }
- cli_dbgmsg("9x compatibility mode\n");
- }
}
if(!pe_plus) { /* PE */
@@ -2333,7 +2317,7 @@
fsize = map->len - peinfo->offset;
if(fmap_readn(map, &e_magic, peinfo->offset, sizeof(e_magic)) != sizeof(e_magic)) {
cli_dbgmsg("Can't read DOS signature\n");
- return CL_CLEAN;
+ return -1;
}
if(EC16(e_magic) != PE_IMAGE_DOS_SIGNATURE && EC16(e_magic) != PE_IMAGE_DOS_SIGNATURE_OLD) {
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/scanners.c
^
|
| @@ -1965,7 +1965,7 @@
static int magic_scandesc(int desc, cli_ctx *ctx, cli_file_t type)
{
- int ret = CL_CLEAN;
+ int ret = CL_CLEAN, res;
cli_file_t dettype = 0;
struct stat sb;
uint8_t typercg = 1;
@@ -2038,10 +2038,11 @@
}
}
- if(cache_check(hash, ctx) == CL_CLEAN) {
+ res = cache_check(hash, ctx);
+ if(res != CL_VIRUS) {
funmap(*ctx->fmap);
ctx->fmap--;
- ret_from_magicscan(CL_CLEAN);
+ ret_from_magicscan(res);
}
hashed_size = (*ctx->fmap)->len;
old_hook_lsig_matches = ctx->hook_lsig_matches;
@@ -2358,8 +2359,12 @@
/* CL_TYPE_HTML: raw HTML files are not scanned, unless safety measure activated via DCONF */
if(type != CL_TYPE_IGNORED && (type != CL_TYPE_HTML || !(DCONF_DOC & DOC_CONF_HTML_SKIPRAW)) && !ctx->engine->sdb) {
- if(cli_scanraw(ctx, type, typercg, &dettype, hash) == CL_VIRUS) {
- ret = cli_checkfp(hash, hashed_size, ctx);
+ res = cli_scanraw(ctx, type, typercg, &dettype, hash);
+ if(res != CL_CLEAN) {
+ if(res == CL_VIRUS)
+ ret = cli_checkfp(hash, hashed_size, ctx);
+ else
+ ret = res;
funmap(*ctx->fmap);
ctx->fmap--;
cli_bitset_free(ctx->hook_lsig_matches);
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libclamav/untar.c
^
|
| @@ -45,6 +45,11 @@
#include "matcher.h"
#define BLOCKSIZE 512
+#define TARSIZEOFFSET 124
+#define TARSIZELEN 12
+#define TARCHECKSUMOFFSET 148
+#define TARCHECKSUMLEN 8
+#define TARFILETYPEOFFSET 156
static int
octal(const char *str)
@@ -56,19 +61,80 @@
return ret;
}
+/**
+ * Retrieve checksum values from a tar header block.
+ * @param header Header data block, padded with zeroes to reach BLOCKSIZE
+ * @return int value of checksum, -1 (from octal()) if bad value
+ */
+static int
+getchecksum(const char *header)
+{
+ char ochecksum[TARCHECKSUMLEN + 1];
+ int checksum = -1;
+
+ strncpy(ochecksum, header+TARCHECKSUMOFFSET, TARCHECKSUMLEN);
+ ochecksum[TARCHECKSUMLEN] = '\0';
+ checksum = octal(ochecksum);
+ return checksum;
+}
+
+/**
+ * Calculate checksum values for tar header blocks.
+ * @param header Header data block, padded with zeroes to reach BLOCKSIZE
+ * @param targetsum Check value to match (as int not octal!)
+ * @return 0 if checksum matches target, -1 if not
+ */
+static int
+testchecksum(const char *header, int targetsum)
+{
+ const unsigned char *posix;
+ const signed char *legacy;
+ int posix_sum = 0, legacy_sum = 0;
+ int i;
+
+ // targetsum -1 represents an error from octal()
+ if (targetsum == -1) {
+ return -1;
+ }
+
+ /* Build checksums. POSIX is unsigned; some legacy tars use signed. */
+ posix = (unsigned char *)header;
+ legacy = (signed char *)header;
+ for (i = 0; i < BLOCKSIZE; i++ ) {
+ if ((i >= TARCHECKSUMOFFSET) && (i < TARCHECKSUMOFFSET + TARCHECKSUMLEN)) {
+ /* Use ascii value of space in place of checksum value */
+ posix_sum += 32;
+ legacy_sum += 32;
+ }
+ else {
+ posix_sum += posix[i];
+ legacy_sum += legacy[i];
+ }
+ }
+
+ if ((targetsum == posix_sum) || (targetsum == legacy_sum)) {
+ return 0;
+ }
+ return -1;
+}
+
int
cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)
{
int size = 0, ret, fout=-1;
int in_block = 0;
+ int last_header_bad = 0;
+ int limitnear = 0;
unsigned int files = 0;
char fullname[NAME_MAX + 1];
+ size_t currsize = 0;
cli_dbgmsg("In untar(%s, %d)\n", dir, desc);
for(;;) {
char block[BLOCKSIZE];
const int nread = cli_readn(desc, block, (unsigned int)sizeof(block));
+ cli_dbgmsg("cli_untar: nread = %d\n", nread);
if(!in_block && nread == 0)
break;
@@ -83,7 +149,9 @@
if(!in_block) {
char type;
int directory, skipEntry = 0;
- char magic[7], name[101], osize[13];
+ int checksum = -1;
+ char magic[7], name[101], osize[TARSIZELEN + 1];
+ currsize = 0;
if(fout>=0) {
lseek(fout, 0, SEEK_SET);
@@ -101,6 +169,21 @@
if((ret=cli_checklimits("cli_untar", ctx, 0, 0, 0))!=CL_CLEAN)
return ret;
+ checksum = getchecksum(block);
+ cli_dbgmsg("cli_untar: Candidate checksum = %d, [%o in octal]\n", checksum, checksum);
+ if(testchecksum(block, checksum) != 0) {
+ // If checksum is bad, dump and look for next header block
+ cli_dbgmsg("cli_untar: Invalid checksum in tar header. Skip to next...\n");
+ if (last_header_bad == 0) {
+ last_header_bad++;
+ cli_dbgmsg("cli_untar: Invalid checksum found inside archive!\n");
+ }
+ continue;
+ } else {
+ last_header_bad = 0;
+ cli_dbgmsg("cli_untar: Checksum %d is valid.\n", checksum);
+ }
+
/* Notice assumption that BLOCKSIZE > 262 */
if(posix) {
strncpy(magic, block+257, 5);
@@ -111,7 +194,7 @@
}
}
- type = block[156];
+ type = block[TARFILETYPEOFFSET];
switch(type) {
default:
@@ -155,23 +238,35 @@
continue;
}
- strncpy(osize, block+124, 12);
- osize[12] = '\0';
+ strncpy(osize, block+TARSIZEOFFSET, TARSIZELEN);
+ osize[TARSIZELEN] = '\0';
size = octal(osize);
if(size < 0) {
cli_dbgmsg("cli_untar: Invalid size in tar header\n");
skipEntry++;
} else {
cli_dbgmsg("cli_untar: size = %d\n", size);
- if((ret=cli_checklimits("cli_untar", ctx, size, 0, 0))!=CL_CLEAN)
- skipEntry++;
+ ret = cli_checklimits("cli_untar", ctx, size, 0, 0);
+ switch(ret) {
+ case CL_EMAXFILES: // Scan no more files
+ skipEntry++;
+ limitnear = 0;
+ break;
+ case CL_EMAXSIZE: // Either single file limit or total byte limit would be exceeded
+ cli_dbgmsg("cli_untar: would exceed limit, will try up to max");
+ limitnear = 1;
+ break;
+ default: // Ok based on reported content size
+ limitnear = 0;
+ break;
+ }
}
if(skipEntry) {
const int nskip = (size % BLOCKSIZE || !size) ? size + BLOCKSIZE - (size % BLOCKSIZE) : size;
if(nskip < 0) {
- cli_dbgmsg("cli_untar: got nagative skip size, giving up\n");
+ cli_dbgmsg("cli_untar: got negative skip size, giving up\n");
return CL_CLEAN;
}
cli_dbgmsg("cli_untar: skipping entry\n");
@@ -198,16 +293,40 @@
in_block = 1;
} else { /* write or continue writing file contents */
- const int nbytes = size>512? 512:size;
- const int nwritten = (int)write(fout, block, (size_t)nbytes);
+ int nbytes, nwritten;
+ int skipwrite = 0;
+ char err[128];
+
+ nbytes = size>512? 512:size;
+ if (nread && nread < nbytes)
+ nbytes = nread;
+
+ if (limitnear > 0) {
+ currsize += nbytes;
+ cli_dbgmsg("cli_untar: Approaching limit...\n");
+ if (cli_checklimits("cli_untar", ctx, (unsigned long)currsize, 0, 0) != CL_SUCCESS) {
+ // Limit would be exceeded by this file, suppress writing beyond limit
+ // Need to keep reading to get to end of file chunk
+ skipwrite++;
+ }
+ }
- if(nwritten != nbytes) {
- cli_errmsg("cli_untar: only wrote %d bytes to file %s (out of disc space?)\n",
- nwritten, fullname);
- close(fout);
- return CL_EWRITE;
+ if (skipwrite == 0) {
+ nwritten = (int)write(fout, block, (size_t)nbytes);
+
+ if(nwritten != nbytes) {
+ cli_errmsg("cli_untar: only wrote %d bytes to file %s (out of disc space?)\n",
+ nwritten, fullname);
+ close(fout);
+ return CL_EWRITE;
+ }
}
size -= nbytes;
+ if ((size != 0) && (nread == 0)) {
+ // Truncated tar file, so end file content like tar behavior
+ cli_dbgmsg("cli_untar: No bytes read! Forcing end of file content.\n");
+ size = 0;
+ }
}
if (size == 0)
in_block = 0;
|
|
[-]
[+]
|
Added |
clamav-0.97.5.tar.bz2/libclamav/version.h
^
|
| @@ -0,0 +1 @@
+#define REPO_VERSION "devel-clamav-0.97.5"
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libltdl/Makefile.am
^
|
| @@ -28,9 +28,6 @@
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#####
-# ClamAV: filter -Werror here
-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
-
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
AM_CPPFLAGS =
@@ -140,6 +137,12 @@
CLEANFILES += $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
EXTRA_DIST += COPYING.LIB \
+ \
+ \
+ \
+ \
+ \
+ \
README
## --------------------------- ##
@@ -154,7 +157,6 @@
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): $(ARGZ_H)
argz.h: argz_.h
- $(mkinstalldirs) .
cp $(srcdir)/argz_.h $@-t
mv $@-t $@
MOSTLYCLEANFILES += argz.h \
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/libltdl/Makefile.in
^
|
| @@ -201,9 +201,7 @@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFGDIR = @CFGDIR@
-
-# ClamAV: filter -Werror here
-CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
+CFLAGS = @CFLAGS@
CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
CHECK_LIBS = @CHECK_LIBS@
CLAMAVGROUP = @CLAMAVGROUP@
@@ -962,7 +960,6 @@
# doesn't have one that works with the given compiler.
all-local $(lib_OBJECTS): $(ARGZ_H)
argz.h: argz_.h
- $(mkinstalldirs) .
cp $(srcdir)/argz_.h $@-t
mv $@-t $@
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/shared/cdiff.c
^
|
| @@ -757,7 +757,7 @@
{
struct cdiff_ctx ctx;
FILE *fh;
- gzFile *gzh;
+ gzFile gzh;
char *line, *lbuf, buff[FILEBUFF], *dsig = NULL;
unsigned int lines = 0, cmds = 0;
unsigned int difflen, diffremain, line_size = CDIFF_LINE_SIZE;
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/shared/tar.c
^
|
| @@ -47,7 +47,7 @@
};
#define TARBLK 512
-int tar_addfile(int fd, gzFile *gzs, const char *file)
+int tar_addfile(int fd, gzFile gzs, const char *file)
{
int s, bytes;
struct tar_header hdr;
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/shared/tar.h
^
|
| @@ -23,6 +23,6 @@
#include <zlib.h>
-int tar_addfile(int fd, gzFile *gzs, const char *file);
+int tar_addfile(int fd, gzFile gzs, const char *file);
#endif
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/sigtool/sigtool.c
^
|
| @@ -500,7 +500,7 @@
SHA256_CTX ctx;
struct stat sb;
FILE *scripth, *cdiffh;
- gzFile *gzh;
+ gzFile gzh;
unsigned int ver, osize;
int bytes;
@@ -629,7 +629,7 @@
const char *newcvd, *localdbdir = NULL;
struct cl_engine *engine;
FILE *cvd, *fh;
- gzFile *tar;
+ gzFile tar;
time_t timet;
struct tm *brokent;
struct cl_cvd *oldcvd;
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/test/Makefile.am
^
|
| @@ -16,7 +16,7 @@
cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@
clean-local:
- rm -f $(FILES)
+ rm -f clam*
EXTRA_DIST = .split
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/test/Makefile.in
^
|
| @@ -428,7 +428,7 @@
cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@
clean-local:
- rm -f $(FILES)
+ rm -f clam*
check: all
|
|
[-]
[+]
|
Changed |
clamav-0.97.5.tar.bz2/unit_tests/valgrind.supp
^
|
| @@ -4,3 +4,9 @@
fun:*
fun:_dl_allocate_tls
}
+{
+ zlib-cond-jump-1.2.3
+ Memcheck:Cond
+ fun:inflateReset2
+ fun:inflateInit2_
+}
|
