cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.95.3, partly from pea@.

Browse Source
This commit is contained in:
sthen 2009-10-30 01:09:34 +00:00
parent b63c6b4c36
commit 1f19ef7388
8 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/clamav/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.46 2009/09/15 18:06:28 sthen Exp $
# $OpenBSD: Makefile,v 1.47 2009/10/30 01:09:34 sthen Exp $
COMMENT= virus scanner
DISTNAME= clamav-0.95.2
PKGNAME= ${DISTNAME}p1
DISTNAME= clamav-0.95.3
CATEGORIES= security
SHARED_LIBS= clamav 12.0 \
clamunrar 2.0 \

10
security/clamav/distinfo
View File

@ -1,5 +1,5 @@
MD5 (clamav-0.95.2.tar.gz) = kwNiOX0w4BuoG18kwQRtSA==
RMD160 (clamav-0.95.2.tar.gz) = g8q1HCJCUTFiiOTDGJupH2QOn4I=
SHA1 (clamav-0.95.2.tar.gz) = dUSznYTyIzuYSpws4+901Aet1IM=
SHA256 (clamav-0.95.2.tar.gz) = 9fKlqZhP0a3mmnwsx42i9dwMUF+Uq1j7KqZhM5mrHFY=
SIZE (clamav-0.95.2.tar.gz) = 25137010
MD5 (clamav-0.95.3.tar.gz) = 6vn8zDzDVnYFqXMjE2UpZw==
RMD160 (clamav-0.95.3.tar.gz) = xoopSKqat6O1+Ol0QyLTYGrm33E=
SHA1 (clamav-0.95.3.tar.gz) = q0sfSdDyQVR2fTA9aie3Ss9vS1k=
SHA256 (clamav-0.95.3.tar.gz) = AD56Vwky/f+9Gfp6eZYnT7/JP4kNJsMGajbrgkyQYlA=
SIZE (clamav-0.95.3.tar.gz) = 26919541

8
security/clamav/patches/patch-clamd_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clamd_Makefile_in,v 1.10 2009/04/11 14:13:59 sthen Exp $
--- clamd/Makefile.in.orig Tue Apr 7 18:56:25 2009
+++ clamd/Makefile.in Fri Apr 10 14:58:49 2009
@@ -160,7 +160,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
$OpenBSD: patch-clamd_Makefile_in,v 1.11 2009/10/30 01:09:34 sthen Exp $
--- clamd/Makefile.in.orig Wed Oct 28 15:54:50 2009
+++ clamd/Makefile.in Wed Oct 28 20:19:29 2009
@@ -163,7 +163,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LCOV = @LCOV@
LD = @LD@

30
security/clamav/patches/patch-database_Makefile_in
View File

@ -1,26 +1,12 @@
$OpenBSD: patch-database_Makefile_in,v 1.5 2009/04/11 14:13:59 sthen Exp $
--- database/Makefile.in.orig Tue Apr 7 18:56:26 2009
+++ database/Makefile.in Fri Apr 10 14:58:49 2009
@@ -397,21 +397,7 @@ uninstall-am:
$OpenBSD: patch-database_Makefile_in,v 1.6 2009/10/30 01:09:34 sthen Exp $
--- database/Makefile.in.orig Wed Oct 28 15:54:51 2009
+++ database/Makefile.in Wed Oct 28 20:20:31 2009
@@ -419,6 +419,8 @@ uninstall-am:
install-data-local:
- @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0;\
- $(mkinstalldirs) $(DESTDIR)$(DBINST);\
- test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\
- test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\
- if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
- chmod 775 $(DESTDIR)$(DBINST); \
- chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
- chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\
- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\
- if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\
- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\
- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
- if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
- fi
+
# 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.
.NOEXPORT:
+NOT-install-data-local:
@test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0;\
$(mkinstalldirs) $(DESTDIR)$(DBINST);\
test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\

22
security/clamav/patches/patch-etc_Makefile_in
View File

@ -1,18 +1,12 @@
$OpenBSD: patch-etc_Makefile_in,v 1.5 2009/04/11 14:13:59 sthen Exp $
--- etc/Makefile.in.orig Tue Apr 7 18:56:26 2009
+++ etc/Makefile.in Fri Apr 10 14:58:49 2009
@@ -396,13 +396,7 @@ uninstall-am:
$OpenBSD: patch-etc_Makefile_in,v 1.6 2009/10/30 01:09:34 sthen Exp $
--- etc/Makefile.in.orig Wed Oct 28 15:54:51 2009
+++ etc/Makefile.in Wed Oct 28 20:20:55 2009
@@ -418,6 +418,8 @@ uninstall-am:
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(CFGINST)
- @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
- $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
- @test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
- $(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ @test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \
-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)
+
# 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.
.NOEXPORT:
+NOT-install-data-local:
$(mkinstalldirs) $(DESTDIR)$(CFGINST)
@test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)

22
security/clamav/patches/patch-libclamav_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libclamav_Makefile_in,v 1.11 2009/06/11 10:50:49 sthen Exp $
--- libclamav/Makefile.in.orig Wed Jun 10 17:40:16 2009
+++ libclamav/Makefile.in Thu Jun 11 11:05:36 2009
@@ -424,7 +424,7 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.
$OpenBSD: patch-libclamav_Makefile_in,v 1.12 2009/10/30 01:09:34 sthen Exp $
--- libclamav/Makefile.in.orig Wed Oct 28 15:54:51 2009
+++ libclamav/Makefile.in Thu Oct 29 16:33:55 2009
@@ -470,7 +470,7 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.
jsparse/generated/operators.h jsparse/generated/keywords.h \
jsparse/future_reserved_words.list jsparse/keywords.list \
jsparse/special_keywords.list jsparse/operators.gperf
@ -10,7 +10,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.11 2009/06/11 10:50:49 sthen Exp $
@ENABLE_UNRAR_TRUE@ @LIBCLAMAV_VERSION@ -no-undefined \
@ENABLE_UNRAR_TRUE@ $(am__append_2)
@ENABLE_UNRAR_TRUE@libclamunrar_la_SOURCES = \
@@ -448,7 +448,7 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.
@@ -494,7 +494,7 @@ EXTRA_DIST = $(am__append_4) regex/engine.c libclamav.
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LIBADD = libclamunrar.la
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_LDFLAGS = -module @TH_SAFE@ \
@ -19,7 +19,7 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.11 2009/06/11 10:50:49 sthen Exp $
@ENABLE_UNRAR_TRUE@ -no-undefined $(am__append_5)
@ENABLE_UNRAR_TRUE@libclamunrar_iface_la_SOURCES = \
@ENABLE_UNRAR_TRUE@ ../libclamunrar_iface/unrar_iface.c \
@@ -497,7 +497,7 @@ libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NO
@@ -543,7 +543,7 @@ libclamav_internal_utils_nothreads_la_CFLAGS = -DCL_NO
libclamav_la_LIBADD = @LIBLTDL@ $(IFACELIBADD) lzma/liblzma.la libclamav_internal_utils.la @LIBCLAMAV_LIBS@ @THREAD_LIBS@
libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) libclamav_internal_utils.la
libclamav_la_CFLAGS = -DSEARCH_LIBDIR=\"$(libdir)\"
@ -28,3 +28,13 @@ $OpenBSD: patch-libclamav_Makefile_in,v 1.11 2009/06/11 10:50:49 sthen Exp $
-no-undefined $(am__append_6)
include_HEADERS = clamav.h
libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \
@@ -1830,6 +1830,9 @@ version.h: version.h.tmp
fi
version.h.tmp:
+ touch version.h.tmp
+
+NOT-version.h.tmp:
@test -f version.h || touch version.h;\
rm -f $@;\
REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\

8
security/clamav/patches/patch-libclamav_ole2_extract_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libclamav_ole2_extract_c,v 1.7 2008/07/08 22:38:12 sthen Exp $
--- libclamav/ole2_extract.c.orig Tue Jun 3 11:47:19 2008
+++ libclamav/ole2_extract.c Thu Jun 12 17:32:13 2008
@@ -142,7 +142,7 @@ typedef struct property_tag
$OpenBSD: patch-libclamav_ole2_extract_c,v 1.8 2009/10/30 01:09:34 sthen Exp $
--- libclamav/ole2_extract.c.orig Wed Oct 28 15:34:13 2009
+++ libclamav/ole2_extract.c Wed Oct 28 20:19:30 2009
@@ -140,7 +140,7 @@ typedef struct property_tag
static unsigned char magic_id[] = { 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1};

12
security/clamav/patches/patch-unit_tests_check_common_sh Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-unit_tests_check_common_sh,v 1.1 2009/10/30 01:09:34 sthen Exp $
--- unit_tests/check_common.sh.orig Thu Oct 29 16:34:54 2009
+++ unit_tests/check_common.sh Thu Oct 29 16:35:05 2009
@@ -47,7 +47,7 @@ die()
# Setup test directory to avoid temporary and output file clashes
test_start() {
- ulimit -t 120; ulimit -d 512000; ulimit -v 512000;
+ ulimit -t 120; ulimit -d 512000;
(cd test-$1 2>/dev/null && killclamd || true)
rm -rf test-$1
mkdir test-$1