@@ -1,3 +1,13 @@

+Sun Jun  6 03:38:08 CEST 2004 (tk)

+----------------------------------

+  * clamscan, freshclam, clamd: make sure privileges are properly dropped

+    (problem on system with CAP_SETUID disabled reported by Tuomas Silen

+    <tuomas.silen*nodeta.fi>)

+  * Makefiles: prevent linking against old libclamav versions (patch (from PLD)

+	       submitted by Oden Eriksson <oeriksson*mandrakesoft.com>)

+  * configure: support pkg-config and clamav-config (patch by Scott Beck

+	       <sbeck*gossamer-threads.com>)

+

 Thu Jun  3 17:53:45 CEST 2004 (tk)

 ----------------------------------

   * doc: update

@@ -16,4 +16,10 @@

 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS shared

+EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in

+

+bin_SCRIPTS=clamav-config

+

+pkgconfigdir = $(libdir)/pkgconfig

+pkgconfig_DATA = libclamav.pc

+

@@ -118,13 +118,22 @@ am__quote = @am__quote@

 install_sh = @install_sh@

 SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool database docs etc clamav-milter

-EXTRA_DIST = FAQ contrib test examples BUGS shared

+EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in

+

+bin_SCRIPTS = clamav-config

+

+pkgconfigdir = $(libdir)/pkgconfig

+pkgconfig_DATA = libclamav.pc

 subdir = .

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = clamav-config.h

-CONFIG_CLEAN_FILES =

+CONFIG_CLEAN_FILES = clamav-config libclamav.pc

+SCRIPTS = $(bin_SCRIPTS)

+

 DIST_SOURCES =

+DATA = $(pkgconfig_DATA)

+

 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \

 	uninstall-info-recursive all-recursive install-data-recursive \

@@ -132,8 +141,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \

 	uninstall-recursive check-recursive installcheck-recursive

 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \

 	Makefile.in NEWS TODO acinclude.m4 aclocal.m4 \

-	clamav-config.h.in config.guess config.sub configure \

-	configure.in depcomp install-sh ltmain.sh missing mkinstalldirs

+	clamav-config.h.in clamav-config.in config.guess config.sub \

+	configure configure.in depcomp install-sh libclamav.pc.in \

+	ltmain.sh missing mkinstalldirs

 DIST_SUBDIRS = $(SUBDIRS)

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -169,6 +179,31 @@ $(srcdir)/clamav-config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4)

 distclean-hdr:

 	-rm -f clamav-config.h

+clamav-config: $(top_builddir)/config.status clamav-config.in

+	cd $(top_builddir) && $(SHELL) ./config.status $@

+libclamav.pc: $(top_builddir)/config.status libclamav.pc.in

+	cd $(top_builddir) && $(SHELL) ./config.status $@

+install-binSCRIPTS: $(bin_SCRIPTS)

+	@$(NORMAL_INSTALL)

+	$(mkinstalldirs) $(DESTDIR)$(bindir)

+	@list='$(bin_SCRIPTS)'; for p in $$list; do \

+	  f="`echo $$p|sed '$(transform)'`"; \

+	  if test -f $$p; then \

+	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \

+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \

+	  elif test -f $(srcdir)/$$p; then \

+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \

+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \

+	  else :; fi; \

+	done

+

+uninstall-binSCRIPTS:

+	@$(NORMAL_UNINSTALL)

+	@list='$(bin_SCRIPTS)'; for p in $$list; do \

+	  f="`echo $$p|sed '$(transform)'`"; \

+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \

+	  rm -f $(DESTDIR)$(bindir)/$$f; \

+	done

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -179,6 +214,24 @@ clean-libtool:

 distclean-libtool:

 	-rm -f libtool

 uninstall-info-am:

+pkgconfigDATA_INSTALL = $(INSTALL_DATA)

+install-pkgconfigDATA: $(pkgconfig_DATA)

+	@$(NORMAL_INSTALL)

+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)

+	@list='$(pkgconfig_DATA)'; for p in $$list; do \

+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

+	  f="`echo $$p | sed -e 's|^.*/||'`"; \

+	  echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \

+	  $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \

+	done

+

+uninstall-pkgconfigDATA:

+	@$(NORMAL_UNINSTALL)

+	@list='$(pkgconfig_DATA)'; for p in $$list; do \

+	  f="`echo $$p | sed -e 's|^.*/||'`"; \

+	  echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \

+	  rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \

+	done

 # This directory's subdirectories are mostly independent; you can cd

 # into them and run `make' without going through this Makefile.

@@ -291,6 +344,7 @@ distcleancheck_listfiles = find . -type f -print

 distdir: $(DISTFILES)

 	$(am__remove_distdir)

 	mkdir $(distdir)

+	$(mkinstalldirs) $(distdir)/.

 	@for file in $(DISTFILES); do \

 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

@@ -378,9 +432,10 @@ distcleancheck: distclean

 	       exit 1; } >&2

 check-am: all-am

 check: check-recursive

-all-am: Makefile clamav-config.h

+all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h

 installdirs: installdirs-recursive

 installdirs-am:

+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir)

 install: install-recursive

 install-exec: install-exec-recursive

@@ -423,9 +478,9 @@ info: info-recursive

 info-am:

-install-data-am:

+install-data-am: install-pkgconfigDATA

-install-exec-am:

+install-exec-am: install-binSCRIPTS

 install-info: install-info-recursive

@@ -441,7 +496,8 @@ mostlyclean: mostlyclean-recursive

 mostlyclean-am: mostlyclean-generic mostlyclean-libtool

-uninstall-am: uninstall-info-am

+uninstall-am: uninstall-binSCRIPTS uninstall-info-am \

+	uninstall-pkgconfigDATA

 uninstall-info: uninstall-info-recursive

@@ -450,16 +506,18 @@ uninstall-info: uninstall-info-recursive

 	dist-gzip distcheck distclean distclean-generic distclean-hdr \

 	distclean-libtool distclean-recursive distclean-tags \

 	distcleancheck distdir dvi dvi-am dvi-recursive info info-am \

-	info-recursive install install-am install-data install-data-am \

-	install-data-recursive install-exec install-exec-am \

-	install-exec-recursive install-info install-info-am \

-	install-info-recursive install-man install-recursive \

-	install-strip installcheck installcheck-am installdirs \

-	installdirs-am installdirs-recursive maintainer-clean \

-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \

-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \

-	tags tags-recursive uninstall uninstall-am uninstall-info-am \

-	uninstall-info-recursive uninstall-recursive

+	info-recursive install install-am install-binSCRIPTS \

+	install-data install-data-am install-data-recursive \

+	install-exec install-exec-am install-exec-recursive \

+	install-info install-info-am install-info-recursive install-man \

+	install-pkgconfigDATA install-recursive install-strip \

+	installcheck installcheck-am installdirs installdirs-am \

+	installdirs-recursive maintainer-clean maintainer-clean-generic \

+	maintainer-clean-recursive mostlyclean mostlyclean-generic \

+	mostlyclean-libtool mostlyclean-recursive tags tags-recursive \

+	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \

+	uninstall-info-recursive uninstall-pkgconfigDATA \

+	uninstall-recursive

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.39 2004/06/02 00:36:04 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.40 2004/06/06 01:50:08 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.39 2004/06/02 00:36:04 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.40 2004/06/06 01:50:08 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

new file mode 100755

@@ -0,0 +1,74 @@

+#! /bin/sh

+# Originally from libxml, Copyright (C) Daniel Veillard

+

+prefix=/usr/local

+exec_prefix=${prefix}

+includedir=${prefix}/include

+libdir=${exec_prefix}/lib

+

+usage()

+{

+    cat <<EOF

+Usage: clamav-config [OPTION]

+

+Known values for OPTION are:

+

+  --prefix=DIR		change libclamav prefix [default $prefix]

+  --libs		print library linking information

+  --cflags		print pre-processor and compiler flags

+  --help		display this help and exit

+  --version		output version information

+EOF

+

+    exit $1

+}

+

+if test $# -eq 0; then

+    usage 1

+fi

+

+cflags=false

+libs=false

+

+while test $# -gt 0; do

+    case "$1" in

+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;

+    *) optarg= ;;

+    esac

+

+    case "$1" in

+    --prefix=*)

+	prefix=$optarg

+	;;

+

+    --prefix)

+	echo $prefix

+	;;

+

+    --version)

+	echo devel-20040606

+	exit 0

+	;;

+

+    --help)

+	usage 0

+	;;

+

+    --cflags)

+       	echo -I${prefix}/include -g -O2

+       	;;

+

+    --libs)

+       	echo -L${exec_prefix}/lib  -lz -lbz2 -lgmp -lpthread

+       	;;

+

+    *)

+	usage

+	exit 1

+	;;

+    esac

+    shift

+done

+

+exit 0

+

new file mode 100644

@@ -0,0 +1,74 @@

+#! /bin/sh

+# Originally from libxml, Copyright (C) Daniel Veillard

+

+prefix=@prefix@

+exec_prefix=@exec_prefix@

+includedir=@includedir@

+libdir=@libdir@

+

+usage()

+{

+    cat <<EOF

+Usage: clamav-config [OPTION]

+

+Known values for OPTION are:

+

+  --prefix=DIR		change libclamav prefix [default $prefix]

+  --libs		print library linking information

+  --cflags		print pre-processor and compiler flags

+  --help		display this help and exit

+  --version		output version information

+EOF

+

+    exit $1

+}

+

+if test $# -eq 0; then

+    usage 1

+fi

+

+cflags=false

+libs=false

+

+while test $# -gt 0; do

+    case "$1" in

+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;

+    *) optarg= ;;

+    esac

+

+    case "$1" in

+    --prefix=*)

+	prefix=$optarg

+	;;

+

+    --prefix)

+	echo $prefix

+	;;

+

+    --version)

+	echo @VERSION@

+	exit 0

+	;;

+

+    --help)

+	usage 0

+	;;

+

+    --cflags)

+       	echo -I@includedir@ @CFLAGS@

+       	;;

+

+    --libs)

+       	echo -L@libdir@ @LIBCLAMAV_LIBS@

+       	;;

+

+    *)

+	usage

+	exit 1

+	;;

+    esac

+    shift

+done

+

+exit 0

+

@@ -35,8 +35,7 @@ man_MANS = $(top_srcdir)/docs/man/clamav-milter.8

 endif

 endif

-DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

-# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

-LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"

+LIBS = $(top_builddir)/libclamav/libclamav.la -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared

 EXTRA_DIST = clamav-milter.c INSTALL

@@ -133,9 +133,8 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8

-DEFS = @DEFS@ -DSENDMAIL_BIN=\"@SENDMAIL@\"

-# CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

-LIBS = -L$(top_builddir)/libclamav -lclamav -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

+AM_CFLAGS = -DSENDMAIL_BIN=\"$(SENDMAIL)\"

+LIBS = $(top_builddir)/libclamav/libclamav.la -L/usr/lib/libmilter -lmilter @CLAMAV_MILTER_LIBS@

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared

 EXTRA_DIST = clamav-milter.c INSTALL

 subdir = clamav-milter

@@ -158,6 +157,8 @@ clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)

 clamav_milter_LDADD = $(LDADD)

 clamav_milter_DEPENDENCIES =

 clamav_milter_LDFLAGS =

+

+DEFS = @DEFS@

 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)

 CPPFLAGS = @CPPFLAGS@

 LDFLAGS = @LDFLAGS@

@@ -60,6 +60,5 @@ clamd_SOURCES = \

 endif

-DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -159,8 +159,7 @@ install_sh = @install_sh@

 @BUILD_CLAMD_TRUE@    shared.h

-DEFS = @DEFS@

-LIBS = -L$(top_builddir)/libclamav -lclamav @CLAMD_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 subdir = clamd

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -183,6 +182,8 @@ clamd_OBJECTS = $(am_clamd_OBJECTS)

 clamd_LDADD = $(LDADD)

 clamd_DEPENDENCIES =

 clamd_LDFLAGS =

+

+DEFS = @DEFS@

 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)

 CPPFLAGS = @CPPFLAGS@

 LDFLAGS = @LDFLAGS@

@@ -204,12 +204,31 @@ void clamd(struct optstruct *opt)

 	}

 	if(cfgopt(copt, "AllowSupplementaryGroups")) {

-	    initgroups(cpt->strarg, user->pw_gid);

-	} else

-	    setgroups(1, &user->pw_gid);

+	    if(initgroups(cpt->strarg, user->pw_gid)) {

+		fprintf(stderr, "ERROR: initgroups() failed.\n");

+		logg("!initgroups() failed.\n");

+		exit(1);

+	    }

+	} else {

+	    if(setgroups(1, &user->pw_gid)) {

+		fprintf(stderr, "ERROR: setgroups() failed.\n");

+		logg("!setgroups() failed.\n");

+		exit(1);

+	    }

+	}

+

+	if(setgid(user->pw_gid)) {

+	    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

+	    logg("!setgid(%d) failed.\n", (int) user->pw_gid);

+	    exit(1);

+	}

+

+	if(setuid(user->pw_uid)) {

+	    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

+	    logg("!setuid(%d) failed.\n", (int) user->pw_uid);

+	    exit(1);

+	}

-	setgid(user->pw_gid);

-	setuid(user->pw_uid);

 	logg("Running as user %s (UID %d, GID %d)\n", cpt->strarg, user->pw_uid, user->pw_gid);

     }

@@ -37,4 +37,4 @@ endif

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -136,7 +136,7 @@ install_sh = @install_sh@

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = clamdscan

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h

@@ -40,5 +40,5 @@ clamscan_SOURCES = \

     defaults.h

 DEFS = @DEFS@ -DCL_NOTHREADS

-LIBS = -L$(top_builddir)/libclamav -lclamav @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -143,7 +143,7 @@ clamscan_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

-LIBS = -L$(top_builddir)/libclamav -lclamav @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

 subdir = clamscan

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -912,9 +912,20 @@ int clamav_unpack(const char *prog, char **args, const char *tmpdir, const struc

 	case 0:

 #ifndef C_CYGWIN

 	    if(!getuid() && user) {

-		setgroups(1, &user->pw_gid);

-		setgid(user->pw_gid);

-		setuid(user->pw_uid);

+		if(setgroups(1, &user->pw_gid)) {

+		    fprintf(stderr, "ERROR: setgroups() failed.\n");

+		    exit(1);

+		}

+

+		if(setgid(user->pw_gid)) {

+		    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

+		    exit(1);

+		}

+

+		if(setuid(user->pw_uid)) {

+		    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

+		    exit(1);

+		}

 	    }

 #endif

 	    chdir(tmpdir);

@@ -84,8 +84,16 @@ int checkaccess(const char *path, const char *username, int mode)

 		return -2;

 	    case 0:

-		setuid(user->pw_uid);

-		setgid(user->pw_gid);

+		if(setgid(user->pw_gid)) {

+		    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

+		    exit(0);

+		}

+

+		if(setuid(user->pw_uid)) {

+		    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

+		    exit(0);

+		}

+

 		if(access(path, mode))

 		    exit(0);

 		else

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -160,9 +160,20 @@ int clamav_rmdirs(const char *dir)

 		if((user = getpwnam(UNPUSER)) == NULL)

 		    return -3;

-		setgroups(1, &user->pw_gid);

-		setgid(user->pw_gid);

-		setuid(user->pw_uid);

+		if(setgroups(1, &user->pw_gid)) {

+		    fprintf(stderr, "ERROR: setgroups() failed.\n");

+		    return -3;

+		}

+

+		if(setgid(user->pw_gid)) {

+		    fprintf(stderr, "ERROR: setgid(%d) failed.\n", (int) user->pw_gid);

+		    return -3;

+		}

+

+		if(setuid(user->pw_uid)) {

+		    fprintf(stderr, "ERROR: setuid(%d) failed.\n", (int) user->pw_uid);

+		    return -3;

+		}

 	    }

 #endif

 	    rmdirs(dir);

@@ -11335,7 +11335,7 @@ cat >>confdefs.h <<_ACEOF

 _ACEOF

-ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile etc/Makefile Makefile"

+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile etc/Makefile Makefile clamav-config libclamav.pc"

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

 # tests run on this system so they can be shared between configure

@@ -11863,6 +11863,8 @@ do

   "sigtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES sigtool/Makefile" ;;

   "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;

   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

+  "clamav-config" ) CONFIG_FILES="$CONFIG_FILES clamav-config" ;;

+  "libclamav.pc" ) CONFIG_FILES="$CONFIG_FILES libclamav.pc" ;;

   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

   "clamav-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;;

   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

@@ -572,4 +572,6 @@ freshclam/Makefile

 sigtool/Makefile

 etc/Makefile

 Makefile

+clamav-config

+libclamav.pc

 ])

@@ -96,6 +96,8 @@ Execute COMMAND after succesful update.

 59: Mirrors are not fully synchronized (try again later).

 .TP 

 60: Can't get information about clamav user from /etc/passwd.

+.TP 

+61: Can't drop privileges.

 .SH "CREDITS"

 Please check the full documentation for credits.

 .SH "AUTHOR"

@@ -40,4 +40,4 @@ freshclam_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -142,7 +142,7 @@ freshclam_SOURCES = \

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = freshclam

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h

@@ -152,9 +152,20 @@ int freshclam(struct optstruct *opt)

 	    exit(60); /* this is critical problem, so we just exit here */

 	}

-	setgroups(1, &user->pw_gid);

-	setgid(user->pw_gid);

-	setuid(user->pw_uid);

+	if(setgroups(1, &user->pw_gid)) {

+	    mprintf("@setgroups() failed.\n");

+	    exit(61);

+	}

+

+	if(setgid(user->pw_gid)) {

+	    mprintf("@setgid(%d) failed.\n", (int) user->pw_gid);

+	    exit(61);

+	}

+

+	if(setuid(user->pw_uid)) {

+	    mprintf("@setuid(%d) failed.\n", (int) user->pw_uid);

+	    exit(61);

+	}

     }

 #endif

new file mode 100644

@@ -0,0 +1,11 @@

+prefix=@prefix@

+exec_prefix=@exec_prefix@

+libdir=@libdir@

+includedir=@includedir@

+

+Name: libclamav

+Description: A GPL virus scanner

+Version: @LIBCLAMAV_VERSION@

+Libs: -L${libdir} @LIBCLAMAV_LIBS@

+Cflags: -I${includedir} @CFLAGS@

+

@@ -34,4 +34,4 @@ sigtool_LDADD = $(top_builddir)/clamscan/others.o

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

@@ -137,7 +137,7 @@ sigtool_LDADD = $(top_builddir)/clamscan/others.o

 DEFS = @DEFS@ -DCL_NOTHREADS

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

-LIBS = -L$(top_builddir)/libclamav -lclamav @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@

 subdir = sigtool

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = $(top_builddir)/clamav-config.h