This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository spatialite-gui.
commit 16a64f57ffab3db1e88e35f5154304e8efdc4e25 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Jun 29 20:09:41 2015 +0200 Drop patches applied upstream. --- debian/changelog | 1 + debian/patches/format-security.patch | 91 ------------------------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 92 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38cda04..2422c25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ spatialite-gui (2.0.0~devel2-1) UNRELEASED; urgency=medium * New upstream pre-release. + * Drop patches applied upstream. -- Bas Couwenberg <sebas...@debian.org> Mon, 29 Jun 2015 20:07:09 +0200 diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch deleted file mode 100644 index 703ca77..0000000 --- a/debian/patches/format-security.patch +++ /dev/null @@ -1,91 +0,0 @@ -Description: Fix -Wformat & -Werror=format-security issues. - Some examples of the issues: - . - Styles.cpp: In member function 'void ReloadVectorStyleDialog::OnOk(wxCommandEvent&)': - Styles.cpp:2838:36: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat=] - sprintf(dummy, "%d", style_id); - . - Styles.cpp: In member function 'VectorCoverageSRIDsList* MyFrame::FindVectorAlternativeSRIDs(wxString&)': - Styles.cpp:3959:33: error: format not a string literal and no format arguments [-Werror=format-security] - sprintf(cvg, coverage.ToUTF8()); -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://groups.google.com/d/msg/spatialite-users/su34eCaUKrI/9M4RMsKR6i0J - ---- a/Styles.cpp -+++ b/Styles.cpp -@@ -2835,7 +2835,7 @@ void ReloadVectorStyleDialog::OnOk(wxCom - if (MainFrame->ValidateVectorStyle(Path.ToUTF8(), &blob, &blob_size) == true) - { - char dummy[80]; -- sprintf(dummy, "%d", style_id); -+ sprintf(dummy, "%ld", style_id); - if (DoReloadVectorStyle(style_id, blob, blob_size) == true) - { - ::wxEndBusyCursor(); -@@ -3047,7 +3047,7 @@ void ReloadRasterStyleDialog::OnOk(wxCom - if (MainFrame->ValidateRasterStyle(Path.ToUTF8(), &blob, &blob_size) == true) - { - char dummy[80]; -- sprintf(dummy, "%d", style_id); -+ sprintf(dummy, "%ld", style_id); - if (DoReloadRasterStyle(style_id, blob, blob_size) == true) - { - ::wxEndBusyCursor(); -@@ -3284,7 +3284,7 @@ void UnregisterRasterStyleDialog::OnOk(w - } - ::wxBeginBusyCursor(); - char dummy[80]; -- sprintf(dummy, "%d", style_id); -+ sprintf(dummy, "%ld", style_id); - if (DoCheckUnreferencedRasterStyle(style_id) == true) - { - if (DoUnregisterRasterStyle(style_id) == true) -@@ -3526,7 +3526,7 @@ void UnregisterVectorStyleDialog::OnOk(w - } - ::wxBeginBusyCursor(); - char dummy[80]; -- sprintf(dummy, "%d", style_id); -+ sprintf(dummy, "%ld", style_id); - if (DoCheckUnreferencedVectorStyle(style_id) == true) - { - if (DoUnregisterVectorStyle(style_id) == true) -@@ -3956,7 +3956,8 @@ VectorCoverageSRIDsList *MyFrame::FindVe - char *sql; - char cvg[1024]; - -- sprintf(cvg, coverage.ToUTF8()); -+ wxCharBuffer buffer=coverage.ToUTF8(); -+ sprintf(cvg, "%s", buffer.data()); - sql = - sqlite3_mprintf - ("SELECT 1, s.srid, s.auth_name, s.auth_srid, s.ref_sys_name FROM vector_coverages AS v " -@@ -4337,7 +4338,8 @@ VectorCoverageKeywordsList *MyFrame::Fin - char *sql; - char cvg[1024]; - -- sprintf(cvg, coverage.ToUTF8()); -+ wxCharBuffer buffer=coverage.ToUTF8(); -+ sprintf(cvg, "%s", buffer.data()); - sql = - sqlite3_mprintf - ("SELECT keyword FROM vector_coverages_keyword WHERE coverage_name = %Q ORDER BY 1", -@@ -4767,7 +4769,8 @@ RasterCoverageSRIDsList *MyFrame::FindRa - char *sql; - char cvg[1024]; - -- sprintf(cvg, coverage.ToUTF8()); -+ wxCharBuffer buffer=coverage.ToUTF8(); -+ sprintf(cvg, "%s", buffer.data()); - sql = - sqlite3_mprintf - ("SELECT 1, s.srid, s.auth_name, s.auth_srid, s.ref_sys_name FROM raster_coverages AS v " -@@ -5147,7 +5150,8 @@ RasterCoverageKeywordsList *MyFrame::Fin - char *sql; - char cvg[1024]; - -- sprintf(cvg, coverage.ToUTF8()); -+ wxCharBuffer buffer=coverage.ToUTF8(); -+ sprintf(cvg, "%s", buffer.data()); - sql = - sqlite3_mprintf - ("SELECT keyword FROM raster_coverages_keyword WHERE coverage_name = %Q ORDER BY 1", diff --git a/debian/patches/series b/debian/patches/series index 80846e8..1e9839c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-fix_binary_name.patch -format-security.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel