[Pkg-voip-commits] r9822 - in /libccscript3/trunk/debian: changelog compat control libccscript3-1.1-0.install libccscript3-dev.install patches/error_format_security.patch patches/series rules source/ source/format

msp at alioth.debian.org msp at alioth.debian.org
Sat Jun 23 05:26:58 UTC 2012 

Author: msp
Date: Sat Jun 23 05:26:53 2012
New Revision: 9822

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9822
Log:
* Ack NMUs - Thanks Gregor & Luk
* Update to Standards Version 3.9.3
* source/format -> 3.0 (quilt)
* debian/compat -> 9 hardening and multiarch
* switch to dh - drop cdbs
* Non-maintainer upload.
* Fix "FTBFS: compiler.cpp:1147:38: error: format not a string literal and
  no format arguments [-Werror=format-security]":
  add patch error_format_security.patch, thanks to Ilya Barygin.
  (Closes: #643417)
* Non-maintainer upload.
* Empty dependency_libs (Closes: #621602).

Added:
    libccscript3/trunk/debian/patches/error_format_security.patch
    libccscript3/trunk/debian/patches/series
    libccscript3/trunk/debian/source/
    libccscript3/trunk/debian/source/format
Modified:
    libccscript3/trunk/debian/changelog
    libccscript3/trunk/debian/compat
    libccscript3/trunk/debian/control
    libccscript3/trunk/debian/libccscript3-1.1-0.install
    libccscript3/trunk/debian/libccscript3-dev.install
    libccscript3/trunk/debian/rules

Modified: libccscript3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/changelog?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/changelog (original)
+++ libccscript3/trunk/debian/changelog Sat Jun 23 05:26:53 2012
@@ -1,15 +1,30 @@
 libccscript3 (1.1.7-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
-  [ Mark Purcell ]
+  * Ack NMUs - Thanks Gregor & Luk
+  * Update to Standards Version 3.9.3
+  * source/format -> 3.0 (quilt)
+  * debian/compat -> 9 hardening and multiarch
+  * switch to dh - drop cdbs
   * Remove obsolete debian/*dirs
 
-  [ Kilian Krause ]
-  * Remove -N from wget args in get-orig-source target as -O is already
-    used.
+ -- Mark Purcell <msp at debian.org>  Sat, 23 Jun 2012 14:54:47 +1000
 
- -- Kilian Krause <kilian at debian.org>  Sat, 09 May 2009 23:34:37 +0200
+libccscript3 (1.1.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: compiler.cpp:1147:38: error: format not a string literal and
+    no format arguments [-Werror=format-security]":
+    add patch error_format_security.patch, thanks to Ilya Barygin.
+    (Closes: #643417)
+
+ -- gregor herrmann <gregoa at debian.org>  Sun, 20 Nov 2011 13:30:14 +0100
+
+libccscript3 (1.1.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Empty dependency_libs (Closes: #621602).
+
+ -- Luk Claes <luk at debian.org>  Fri, 01 Jul 2011 18:37:51 +0200
 
 libccscript3 (1.1.7-1) unstable; urgency=low
 

Modified: libccscript3/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/compat?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/compat (original)
+++ libccscript3/trunk/debian/compat Sat Jun 23 05:26:53 2012
@@ -1,1 +1,1 @@
-4
+9

Modified: libccscript3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/control?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/control (original)
+++ libccscript3/trunk/debian/control Sat Jun 23 05:26:53 2012
@@ -2,9 +2,10 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libcommoncpp2-dev (>= 1.3.10-4), pkg-config, doxygen, unixodbc-dev, cdbs, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, doxygen,
+ libcommoncpp2-dev, unixodbc-dev
 Section: libs
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
 Homepage: http://www.gnu.org/software/ccscript/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/libccscript3/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libccscript3/?op=log
@@ -26,6 +27,7 @@
 Package: libccscript3-1.1-0
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Common C++ framework for embedded scripting
  The GNU ccScript package offers a class extensible threaded embedded

Modified: libccscript3/trunk/debian/libccscript3-1.1-0.install
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/libccscript3-1.1-0.install?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/libccscript3-1.1-0.install (original)
+++ libccscript3/trunk/debian/libccscript3-1.1-0.install Sat Jun 23 05:26:53 2012
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/ccscript3-*/*
+usr/lib/*/lib*.so.*
+usr/lib/*/ccscript3-*/*

Modified: libccscript3/trunk/debian/libccscript3-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/libccscript3-dev.install?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/libccscript3-dev.install (original)
+++ libccscript3/trunk/debian/libccscript3-dev.install Sat Jun 23 05:26:53 2012
@@ -1,6 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/lib/*.la
-usr/share/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
+usr/lib/*/*.la

Added: libccscript3/trunk/debian/patches/error_format_security.patch
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/patches/error_format_security.patch?rev=9822&op=file
==============================================================================
--- libccscript3/trunk/debian/patches/error_format_security.patch (added)
+++ libccscript3/trunk/debian/patches/error_format_security.patch Sat Jun 23 05:26:53 2012
@@ -1,0 +1,22 @@
+--- libccscript3-1.1.7.orig/src/compiler.cpp
++++ libccscript3-1.1.7/src/compiler.cpp
+@@ -1144,7 +1144,7 @@
+ 				continue;
+ 
+ 			if(!strchr(token, ':')) {
+-				snprintf(temp, sizeof(temp), name);
++				snprintf(temp, sizeof(temp), "%s", name);
+ 				cp = strchr(temp, ':');
+ 				if(cp)
+ 					*cp = 0;
+--- libccscript3-1.1.7.orig/modules/property.cpp
++++ libccscript3-1.1.7/modules/property.cpp
+@@ -381,7 +381,7 @@
+ 			goto unlock;
+ 
+ 		sym->type = symORIGINAL;
+-		snprintf(sym->data, sym->size + 1, ep);
++		snprintf(sym->data, sym->size + 1, "%s", ep);
+ unlock:
+ 		release();
+ 		Thread::yield();

Added: libccscript3/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/patches/series?rev=9822&op=file
==============================================================================
--- libccscript3/trunk/debian/patches/series (added)
+++ libccscript3/trunk/debian/patches/series Sat Jun 23 05:26:53 2012
@@ -1,0 +1,3 @@
+dbug365518.patch
+error_format_security.patch
+gcc-4.3.patch

Modified: libccscript3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/rules?rev=9822&op=diff
==============================================================================
--- libccscript3/trunk/debian/rules (original)
+++ libccscript3/trunk/debian/rules Sat Jun 23 05:26:53 2012
@@ -1,21 +1,7 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --parallel --with autotools_dev
 
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-URL = http://ftp.gnu.org/pub/gnu/ccscript/ccscript3-$(DEB_UPSTREAM_VERSION).tar.gz
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
+override_dh_install:
+	sed -i "/dependency_libs/ s/'.*'/''/" `find $(CURDIR)/debian -name '*.la'`
+	dh_install

Added: libccscript3/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/libccscript3/trunk/debian/source/format?rev=9822&op=file
==============================================================================
--- libccscript3/trunk/debian/source/format (added)
+++ libccscript3/trunk/debian/source/format Sat Jun 23 05:26:53 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-voip-commits mailing list