Package: sqlmap
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 1a77687e846b646e7cb59702c0dbdd528b7ec445 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 10:53:30 -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 | 10 +++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 2 -
...ths_home_dir.dpatch => 01_paths_home_dir.patch} | 18 ++++++------
.../patches/{02_update.dpatch => 02_update.patch} | 28 ++++++++++----------
debian/patches/series | 2 +
debian/rules | 9 ++----
debian/source/format | 1 +
9 files changed, 42 insertions(+), 34 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_paths_home_dir.dpatch => 01_paths_home_dir.patch} (77%)
rename debian/patches/{02_update.dpatch => 02_update.patch} (59%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 5a310e8..e48b509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sqlmap (0.6.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patches were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 10:41:24 -0500
+
sqlmap (0.6.4-1) unstable; urgency=low
* Initial release (Closes: #497667)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 6123c9a..5168d2b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sqlmap
Section: net
Priority: extra
Maintainer: Bernardo Damele A. G. <bernardo.dam...@gmail.com>
-Build-Depends: debhelper (>= 5), python-support, dpatch
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), python-support
+Standards-Version: 3.9.3
Homepage: http://sqlmap.sourceforge.net/
Package: sqlmap
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c377b6e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_paths_home_dir
-02_update
diff --git a/debian/patches/01_paths_home_dir.dpatch b/debian/patches/01_paths_home_dir.patch
similarity index 77%
rename from debian/patches/01_paths_home_dir.dpatch
rename to debian/patches/01_paths_home_dir.patch
index 289f46c..4e8e55d 100644
--- a/debian/patches/01_paths_home_dir.dpatch
+++ b/debian/patches/01_paths_home_dir.patch
@@ -1,14 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_output_home_dir.dpatch by Bernardo Damele A. G. <bernardo.dam...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Modify the paths available to write to $HOME/.sqlmap/ folder
+From: Bernardo Damele A. G. <bernardo.dam...@gmail.com>
+Subject: Modify the paths available to write to $HOME/.sqlmap/ folder
-@DPATCH@
---- sqlmap-orig/lib/core/common.py 2008-07-21 15:00:00.000000000 +0100
-+++ sqlmap/lib/core/common.py 2008-07-21 15:05:00.000000000 +0100
-@@ -505,19 +505,25 @@
+---
+ lib/core/common.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+--- a/lib/core/common.py
++++ b/lib/core/common.py
+@@ -507,19 +507,25 @@
return upperQuery
diff --git a/debian/patches/02_update.dpatch b/debian/patches/02_update.patch
similarity index 59%
rename from debian/patches/02_update.dpatch
rename to debian/patches/02_update.patch
index c9256ca..8fe30b0 100644
--- a/debian/patches/02_update.dpatch
+++ b/debian/patches/02_update.patch
@@ -1,15 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_output_home_dir.dpatch by Bernardo Damele A. G. <bernardo.dam...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: --update is possible only if the user is root when sqlmap is
-## DP: installed from its binary package
+From: Bernardo Damele A. G. <bernardo.dam...@gmail.com>
+Subject: --update is possible only if the user is root when sqlmap is
+ installed from its binary package
-@DPATCH@
---- sqlmap-orig/lib/core/update.py 2008-07-09 14:00:00.000000000 +0100
-+++ sqlmap/lib/core/update.py 2008-07-09 14:03:47.000000000 +0100
-@@ -41,6 +41,7 @@
+---
+ lib/core/update.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/lib/core/update.py
++++ b/lib/core/update.py
+@@ -42,6 +42,7 @@
from lib.core.data import paths
from lib.core.exception import sqlmapConnectionException
from lib.core.exception import sqlmapFilePathException
@@ -17,9 +17,9 @@
from lib.core.settings import MSSQL_VERSIONS_URL
from lib.core.settings import SQLMAP_VERSION_URL
from lib.core.settings import SQLMAP_SOURCE_URL
-@@ -306,6 +307,11 @@
- shutil.copy(srcFile, dstFile)
- shutil.copymode(srcFile, dstFile)
+@@ -328,6 +329,11 @@
+ if f.endswith(".py"):
+ os.chmod(dstFile, 0755)
+ if f == "sqlmap.py" and os.path.exists(dstFile[:-3]):
+ os.remove(dstFile[:-3])
@@ -29,7 +29,7 @@
infoMsg = "sqlmap updated successfully"
logger.info(infoMsg)
-@@ -314,5 +319,9 @@
+@@ -336,5 +342,9 @@
if not conf.updateAll:
return
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..110aa07
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_paths_home_dir.patch
+02_update.patch
diff --git a/debian/rules b/debian/rules
index cf36b70..3b7ea7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
@@ -13,22 +12,20 @@ configure-stamp:
touch configure-stamp
-build: patch build-stamp
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
touch $@
-clean: clean-patched unpatch
-
-clean-patched: patch-stamp
+clean:
rm -f build-stamp configure-stamp
dh_clean
-install: patch build
+install: build
dh_testdir
dh_testroot
dh_clean -k
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
