[Python-modules-commits] r15795 - in packages/python-clamav/trunk (12 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sat Feb 19 19:05:31 UTC 2011
Date: Saturday, February 19, 2011 @ 19:05:19
Author: kitterman
Revision: 15795
[svn-inject] Applying Debian modifications (0.4.1-3) to trunk
Added:
packages/python-clamav/trunk/debian/
packages/python-clamav/trunk/debian/changelog
packages/python-clamav/trunk/debian/compat
packages/python-clamav/trunk/debian/control
packages/python-clamav/trunk/debian/copyright
packages/python-clamav/trunk/debian/docs
packages/python-clamav/trunk/debian/patches/
packages/python-clamav/trunk/debian/patches/clamav-095-compat.patch
packages/python-clamav/trunk/debian/patches/series
packages/python-clamav/trunk/debian/rules
packages/python-clamav/trunk/debian/source/
packages/python-clamav/trunk/debian/source/format
Property changes on: packages/python-clamav/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/python-clamav/trunk/debian/changelog
===================================================================
--- packages/python-clamav/trunk/debian/changelog (rev 0)
+++ packages/python-clamav/trunk/debian/changelog 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,87 @@
+python-clamav (0.4.1-3) unstable; urgency=low
+
+ * Use correct DPMT address for maintainer
+ * Add vcs-* fields to debian/control
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 03 Oct 2010 13:03:20 -0400
+
+python-clamav (0.4.1-2) unstable; urgency=low
+
+ * Agreed maintainer change to Debian Python Modules Team
+ - Add myself to uploaders
+ - Thanks to Cédric Delfosse for his work maintaining python-clamav
+ * Acknowledge NMU (Closes: #524645)
+ - Thanks to Imre Gergely
+ * Convert to source format 3.0 (Quilt) to add patch system
+ - Convert existing inline change to debian/patches/clamav-095-compat.patch
+ * Improve debian/copyright
+ * Add Homepage to debian/control and bump standards version to 3.9.1.0
+ without further change
+ * Remove obsolete debian/pycompat file
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 22 Sep 2010 12:30:43 -0400
+
+python-clamav (0.4.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build against libclamav6/clamav 0.95
+ - modified pyclamav.c source to use the new API functions
+ - cleaned up some old code for clamav 0.75
+ - updated Build-Depends
+
+ -- Imre Gergely <gimre at narancs.net> Sat, 18 Apr 2009 17:00:51 +0300
+
+python-clamav (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cédric Delfosse <cedric at debian.org> Tue, 06 May 2008 14:30:24 +0200
+
+python-clamav (0.4.0-2) unstable; urgency=low
+
+ * Update debian/rules to fix FTBFS if build twice in a row
+ (Closes: Bug#442708)
+
+ -- Cédric Delfosse <cedric at debian.org> Tue, 11 Mar 2008 22:01:11 +0100
+
+python-clamav (0.4.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Cédric Delfosse <cedric at debian.org> Wed, 11 Jul 2007 21:26:18 +0200
+
+python-clamav (0.3.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump debhelper compat mode to 5.
+ * Use python-support instead of pycentral.
+
+ -- Cédric Delfosse <cedric at debian.org> Sat, 8 Jul 2006 20:35:50 +0200
+
+python-clamav (0.3.0-2) unstable; urgency=low
+
+ * Update package to new Debian Python Policy (Closes: Bug#373520)
+ * Update Standards-Version to 3.7.2
+
+ -- Cédric Delfosse <cedric at debian.org> Wed, 14 Jun 2006 19:57:23 +0200
+
+python-clamav (0.3.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Update Standards-Version to 3.6.2
+ * Fix long description ("add" -> "adds")
+
+ -- Cédric Delfosse <cedric at debian.org> Sat, 9 Jul 2005 14:45:40 +0200
+
+python-clamav (0.2.2-2) unstable; urgency=low
+
+ * Build against new libclamav1 0.85.1.
+
+ -- Cédric Delfosse <cedric at debian.org> Thu, 26 May 2005 22:17:23 +0200
+
+python-clamav (0.2.2-1) unstable; urgency=low
+
+ * Initial Release. (Closes: Bug#278572)
+
+ -- Cédric Delfosse <cedric at debian.org> Tue, 26 Apr 2005 22:02:32 +0200
+
Added: packages/python-clamav/trunk/debian/compat
===================================================================
--- packages/python-clamav/trunk/debian/compat (rev 0)
+++ packages/python-clamav/trunk/debian/compat 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1 @@
+5
Added: packages/python-clamav/trunk/debian/control
===================================================================
--- packages/python-clamav/trunk/debian/control (rev 0)
+++ packages/python-clamav/trunk/debian/control 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,18 @@
+Source: python-clamav
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Scott Kitterman <scott at kitterman.com>
+Build-Depends: debhelper (>= 5.0.37.2), libclamav-dev (>= 0.95), python (>= 2.3.5-11), python-support (>= 0.3), python-all-dev
+Standards-Version: 3.9.1.0
+Homepage: http://xael.org/norman/python/pyclamav/index.html
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-clamav/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-clamav/trunk/
+
+Package: python-clamav
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, clamav-freshclam | clamav-data
+Provides: ${python:Provides}
+Description: Python bindings to ClamAV
+ This package adds virus detection capabilities to Python software, thanks to
+ the ClamAV antivirus toolkit.
Added: packages/python-clamav/trunk/debian/copyright
===================================================================
--- packages/python-clamav/trunk/debian/copyright (rev 0)
+++ packages/python-clamav/trunk/debian/copyright 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,26 @@
+This package was debianized by Cédric Delfosse <cedric at debian.org> on
+Tue, 26 Apr 2005 22:02:32 +0200.
+
+It was downloaded from http://xael.org/norman/python/pyclamav/index.html
+
+Copyright Holder: © 2005 Alexandre Norman <norman at freesurf.fr>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
Added: packages/python-clamav/trunk/debian/docs
===================================================================
--- packages/python-clamav/trunk/debian/docs (rev 0)
+++ packages/python-clamav/trunk/debian/docs 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,3 @@
+gpl.txt
+README.txt
+README.txt
Added: packages/python-clamav/trunk/debian/patches/clamav-095-compat.patch
===================================================================
--- packages/python-clamav/trunk/debian/patches/clamav-095-compat.patch (rev 0)
+++ packages/python-clamav/trunk/debian/patches/clamav-095-compat.patch 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,128 @@
+Bug-Debian: http://bugs.debian.org/524645
+Reviewed-By: Michael Casadevall <mcasadevall at buildd.net>
+Last-Update: <2009-04-20>
+
+--- python-clamav-0.4.1.orig/pyclamav.c
++++ python-clamav-0.4.1/pyclamav.c
+@@ -33,25 +33,6 @@
+
+ /* ********************************************************* */
+
+-/* To be able to compile with
+- releases 0.75 of libclamav
+-
+- Where cl_free was cl_freetrie
+- and cl_build was cl_buildtrie
+- CL_SCAN_STDOPT did not exist
+-*/
+-#ifndef CL_SCAN_STDOPT
+-#define CL_SCAN_STDOPT CL_RAW | CL_ARCHIVE | CL_MAIL | CL_DISABLERAR | CL_OLE2 | CL_ENCRYPTED
+-void cl_free(struct cl_node *rootnode) {
+- cl_freetrie(rootnode);
+- return;
+-}
+-
+-int cl_build(struct cl_node *rootnode) {
+- return cl_buildtrie(rootnode);
+-}
+-#endif
+-
+ /* For python prior to 2.3 */
+ #ifndef PyMODINIT_FUNC
+ #define PyMODINIT_FUNC void
+@@ -68,11 +49,9 @@ static PyObject *PyclamavError;
+ unsigned int signumber = 0;
+
+ /* Structures for clamav */
+-struct cl_node *root = NULL;
+-struct cl_limits limits;
++struct cl_engine *engine = NULL;
+ struct cl_stat dbstat;
+
+-
+ /*
+ * If the virus database has been changed, then
+ * free the current tree and reload the new one
+@@ -85,22 +64,22 @@ int if_database_have_changed_then_reload
+ /* If yes : reload DB */
+ if (cl_statchkdir(&dbstat) == 1)
+ {
+- /* free the tree */
+- cl_free(root);
++ /* free the engine */
++ cl_engine_free(engine);
+ signumber=0;
+- root=NULL;
++ engine=NULL;
+
+ /* Load DB */
+- if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
++ if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT)) != CL_SUCCESS) {
+ /* Raise exception with error message */
+ PyErr_SetString(PyclamavError, cl_strerror(ret));
+ return -2;
+ }
+
+- /* build the final tree */
+- if((ret = cl_build(root))) {
+- /* free the partial tree */
+- cl_free(root);
++ /* prepare the engine */
++ if((ret = cl_engine_compile(engine))) {
++ /* free the engine */
++ cl_engine_free(engine);
+ /* Raise exception with error message */
+ PyErr_SetString(PyclamavError, cl_strerror(ret));
+ return -2;
+@@ -231,7 +210,7 @@ static PyObject *pyclamav_scanfile(PyObj
+ return NULL;
+ }
+
+- ret = cl_scanfile(file_to_scan, &virname, &size, root, &limits, CL_SCAN_STDOPT);
++ ret = cl_scanfile(file_to_scan, &virname, &size, engine, CL_SCAN_STDOPT);
+
+ /* Test return code */
+ switch (ret) {
+@@ -278,17 +257,21 @@ PyMODINIT_FUNC initpyclamav(void)
+ /* Set documentation string for the module */
+ PyDict_SetItemString(dict, "__doc__", PyString_FromString("pyclamav :\n\n This is a python binding to the C libclamav library\n (from the Clamav project - http://www.clamav.net).\n It can be used to easily allow a Python script to scan\n a file or a buffer against known viruses.\n\nAuthor : Alexandre Norman [norman at xael.org]\n\nFunctions :\n - scanfile(string filename) : Scan a file for virus.\n - get_numsig() : Return the number of known signatures.\n - get_version() : Return the version of Clamav.\n - version() : Return the version of pyclamav.\n"));
+
++ /* initialize libclamav */
++ cl_init(CL_INIT_DEFAULT);
++ engine = cl_engine_new();
+
+- if((ret = cl_load(cl_retdbdir(), &root, &signumber, CL_DB_STDOPT))) {
++ if((ret = cl_load(cl_retdbdir(), engine, &signumber, CL_DB_STDOPT))) {
+ /* Raise exception with error message */
+ PyErr_SetString(PyclamavError, cl_strerror(ret));
++ cl_engine_free(engine);
+ return;
+ }
+
+- /* build the final tree */
+- if((ret = cl_build(root))) {
+- /* free the partial tree */
+- cl_free(root);
++ /* prepare the engine */
++ if((ret = cl_engine_compile(engine)) != CL_SUCCESS) {
++ /* free up the engine resources */
++ cl_engine_free(engine);
+ /* Raise exception with error message */
+ PyErr_SetString(PyclamavError, cl_strerror(ret));
+ return;
+@@ -299,15 +282,6 @@ PyMODINIT_FUNC initpyclamav(void)
+ memset(&dbstat, 0, sizeof(struct cl_stat));
+ cl_statinidir(cl_retdbdir(), &dbstat);
+
+-
+-
+- /* set up archive limits */
+- memset(&limits, 0, sizeof(struct cl_limits));
+- limits.maxfiles = 1000; /* max files */
+- limits.maxfilesize = 10 * 1048576; /* maximal archived file size == 10 Mb */
+- limits.maxreclevel = 5; /* maximal recursion level */
+- limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */
+-
+ return ;
+ }
+
Added: packages/python-clamav/trunk/debian/patches/series
===================================================================
--- packages/python-clamav/trunk/debian/patches/series (rev 0)
+++ packages/python-clamav/trunk/debian/patches/series 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1 @@
+clamav-095-compat.patch
Added: packages/python-clamav/trunk/debian/rules
===================================================================
--- packages/python-clamav/trunk/debian/rules (rev 0)
+++ packages/python-clamav/trunk/debian/rules 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1,63 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+PYVERS=$(shell pyversions -vs)
+
+
+build: $(PYVERS:%=build-python%)
+ touch $@
+build-python%:
+ python$* setup.py build
+ touch $@
+
+install: build $(PYVERS:%=install-python%)
+install-python%:
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ python$* setup.py install --root $(CURDIR)/debian/python-clamav
+
+clean: $(PYVERS:%=clean-python%)
+clean-python%:
+ dh_testdir
+ python$* setup.py clean
+ dh_testroot
+ rm -fr build build-python$*
+ dh_clean
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGELOG
+ dh_installdocs
+ dh_installexamples
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_pysupport
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: packages/python-clamav/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/python-clamav/trunk/debian/source/format
===================================================================
--- packages/python-clamav/trunk/debian/source/format (rev 0)
+++ packages/python-clamav/trunk/debian/source/format 2011-02-19 19:05:19 UTC (rev 15795)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list