Package: havp
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 615963429f64848efa256ccad1be31df1b6d1534 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 28 Feb 2012 13:20:39 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 8 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 3 --
...{03_havp.config.dpatch => 03_havp.config.patch} | 35 +++++++++----------
debian/patches/04_params.cpp.dpatch | 21 ------------
debian/patches/04_params.cpp.patch | 21 ++++++++++++
...ption.dpatch => 05_add_ssltimeout_option.patch} | 9 +----
debian/patches/series | 3 ++
debian/rules | 13 +------
debian/source/format | 1 +
11 files changed, 57 insertions(+), 63 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{03_havp.config.dpatch => 03_havp.config.patch} (63%)
delete mode 100644 debian/patches/04_params.cpp.dpatch
create mode 100644 debian/patches/04_params.cpp.patch
rename debian/patches/{05_add_ssltimeout_option.dpatch => 05_add_ssltimeout_option.patch} (84%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 5961703..08cd9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+havp (0.92a-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 28 Feb 2012 13:00:10 -0500
+
havp (0.92a-2) unstable; urgency=low
* Include debconf language updates from previous NMU and new updates.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 5bb21a5..ad2aac9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: havp
Section: net
Priority: optional
Maintainer: Rene Mayrhofer <rene.mayrho...@gibraltar.at>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libssl-dev, libclamav-dev, dpatch, docbook-to-man, po-debconf
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9), autotools-dev, libssl-dev, libclamav-dev, docbook-to-man, po-debconf
+Standards-Version: 3.9.3
Package: havp
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7a64269..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-03_havp.config
-04_params.cpp
-05_add_ssltimeout_option
\ No newline at end of file
diff --git a/debian/patches/03_havp.config.dpatch b/debian/patches/03_havp.config.patch
similarity index 63%
rename from debian/patches/03_havp.config.dpatch
rename to debian/patches/03_havp.config.patch
index 3fefd49..cd2efa1 100644
--- a/debian/patches/03_havp.config.dpatch
+++ b/debian/patches/03_havp.config.patch
@@ -1,39 +1,38 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_havp.config.dpatch by <mfladisc...@home.fladi.at>
-## adapted and cleaned up by Rene Mayrhofer
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set PID file and SCANTEMPFILE to correct locations
+From: <mfladisc...@home.fladi.at>
+Subject: Set PID file and SCANTEMPFILE to correct locations
-@DPATCH@
---- havp-0.85/etc/havp/havp.config.in.orig 2007-03-13 11:49:25.482732863 +0100
-+++ havp-0.85/etc/havp/havp.config.in 2007-03-13 11:50:33.667542226 +0100
+---
+ etc/havp/havp.config.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/etc/havp/havp.config.in
++++ b/etc/havp/havp.config.in
@@ -16,7 +16,7 @@
# You must remove this line for HAVP to start.
# This makes sure you have (hopefully) reviewed the configuration. :)
# Hint: You must enable some scanner! Find them in the end..
-REMOVETHISLINE deleteme
+# REMOVETHISLINE deleteme
-
+
#
# For reasons of security it is recommended to run a proxy program
-@@ -103,7 +103,7 @@
+@@ -113,7 +113,7 @@
# These characters are used by system to create unique named files.
#
# Default:
-# SCANTEMPFILE /var/tmp/havp/havp-XXXXXX
+# SCANTEMPFILE /var/spool/havp/havp-XXXXXX
-
+
#
- # Is scanner error fatal?
-@@ -342,14 +342,14 @@
+ # Directory for ClamAV and other scanner created tempfiles.
+@@ -428,14 +428,14 @@
##### ClamAV Library Scanner (libclamav)
#####
-
+
-ENABLECLAMLIB false
+ENABLECLAMLIB true
-
+
# HAVP uses libclamav hardcoded pattern directory, which usually is
-# /usr/local/share/clamav. You only need to set CLAMDBDIR, if you are
+# /usr/share/clamav. You only need to set CLAMDBDIR, if you are
@@ -42,6 +41,6 @@
# Default: NONE
-# CLAMDBDIR /path/to/directory
+# CLAMDBDIR /var/lib/clamav
-
- # Should we block encrypted archives?
+
+ # Should we block broken executables?
#
diff --git a/debian/patches/04_params.cpp.dpatch b/debian/patches/04_params.cpp.dpatch
deleted file mode 100644
index 64d493b..0000000
--- a/debian/patches/04_params.cpp.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_params.cpp.dpatch by <mfladisc...@home.fladi.at>
-## adapted and cleaned up by Rene Mayrhofer
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set PID file and SCANTEMPFILE to correct locations
-
-@DPATCH@
-
---- havp-0.85/havp/params.cpp.orig 2007-03-13 11:50:45.812848266 +0100
-+++ havp-0.85/havp/params.cpp 2007-03-13 11:51:19.209457684 +0100
-@@ -62,7 +62,7 @@
- SetConfig("BLACKLIST", BLACKLISTFILE);
- SetConfig("TEMPLATEPATH", TEMPLATEPATH);
-- SetConfig("TEMPDIR", "/var/tmp");
-+ SetConfig("TEMPDIR", "/var/spool/havp");
-- SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX");
-+ SetConfig("SCANTEMPFILE", "/var/spool/havp/havp-XXXXXX");
- SetConfig("PIDFILE", PIDFILE);
- SetConfig("TRANSPARENT", "false");
- SetConfig("RANGE", "false");
diff --git a/debian/patches/04_params.cpp.patch b/debian/patches/04_params.cpp.patch
new file mode 100644
index 0000000..8bee9dc
--- /dev/null
+++ b/debian/patches/04_params.cpp.patch
@@ -0,0 +1,21 @@
+From: <mfladisc...@home.fladi.at>
+Subject: Set PID file and SCANTEMPFILE to correct locations
+
+
+---
+ havp/params.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/havp/params.cpp
++++ b/havp/params.cpp
+@@ -70,8 +70,8 @@
+ SetConfig("WHITELIST", WHITELISTFILE);
+ SetConfig("BLACKLIST", BLACKLISTFILE);
+ SetConfig("TEMPLATEPATH", TEMPLATEPATH);
+- SetConfig("TEMPDIR", "/var/tmp");
+- SetConfig("SCANTEMPFILE", "/var/tmp/havp/havp-XXXXXX");
++ SetConfig("TEMPDIR", "/var/spool/havp");
++ SetConfig("SCANTEMPFILE", "/var/spool/havp/havp-XXXXXX");
+ SetConfig("PIDFILE", PIDFILE);
+ SetConfig("TRANSPARENT", "false");
+ SetConfig("RANGE", "false");
diff --git a/debian/patches/05_add_ssltimeout_option.dpatch b/debian/patches/05_add_ssltimeout_option.patch
similarity index 84%
rename from debian/patches/05_add_ssltimeout_option.dpatch
rename to debian/patches/05_add_ssltimeout_option.patch
index ddab0db..242613f 100644
--- a/debian/patches/05_add_ssltimeout_option.dpatch
+++ b/debian/patches/05_add_ssltimeout_option.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_add_ssltimeout_option.dpatch by Rene Mayrhofer, adapted from a patch by
-## Heiko Schlittermann
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add SSLTIMEOUT config option
+From: Rene Mayrhofer, adapted from a patch by
+Subject: Add SSLTIMEOUT config option
-@DPATCH@
--- a/havp/default.h.in
+++ b/havp/default.h.in
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2cab9e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+03_havp.config.patch
+04_params.cpp.patch
+05_add_ssltimeout_option.patch
diff --git a/debian/rules b/debian/rules
index 74462b4..34acdce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
extra_opts += --disable-locking
endif
-config.status: patch configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/openssl" \
@@ -51,7 +51,7 @@ build-stamp: config.status
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config.status
@@ -108,14 +108,5 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
