[Pkg-voip-commits] [libccscript3] 02/06: Imported Debian patch 1.1.7-2
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 11:51:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository libccscript3.
commit 728f6a545cd770a5c0f9454c766202c1bf11e951
Author: Mark Purcell <msp at debian.org>
Date: Sat Jun 23 15:42:07 2012 +1000
Imported Debian patch 1.1.7-2
---
debian/changelog | 31 ++++++++
debian/compat | 2 +-
debian/control | 15 ++--
debian/copyright | 2 +-
debian/libccscript3-1.1-0.dirs | 1 -
debian/libccscript3-1.1-0.install | 4 +-
debian/libccscript3-dev.dirs | 2 -
debian/libccscript3-dev.install | 9 +--
debian/patches/error_format_security.patch | 22 ++++++
debian/patches/series | 4 +
debian/patches/spelling-error-in-binary.patch | 103 ++++++++++++++++++++++++++
debian/rules | 24 ++----
debian/source/format | 1 +
13 files changed, 184 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index adbde05..0ced6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+libccscript3 (1.1.7-2) unstable; urgency=low
+
+ * wheezey polish
+
+ * 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
+ * misc lintian fixes
+
+ -- Mark Purcell <msp at debian.org> Sat, 23 Jun 2012 15:42:07 +1000
+
+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
* New upstream release
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 f984291..59a7e57 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: libccscript3
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
@@ -12,8 +13,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libccscript3/?op=log
Package: libccscript3-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libccscript3-1.1-0 (= ${binary:Version}), libcommoncpp2-dev (>= 1.3.10-4), pkg-config
-Description: GNU Common C++ framework for embedded scripting
+Depends: ${misc:Depends}, libccscript3-1.1-0 (= ${binary:Version}), libcommoncpp2-dev, pkg-config
+Description: GNU Common C++ framework for embedded scripting - development files
The GNU ccScript package offers a class extensible threaded embedded
scripting engine for use with GNU Common C++. This engine is also used in
GNU Bayonne (the GNU telephony application server package) and other
@@ -22,11 +23,15 @@ Description: GNU Common C++ framework for embedded scripting
real-time state-event systems through deterministic callback step
execution rather than the linear and non-deterministic fashion of embedded
script systems such as Tcl, libguile, etc.
+ .
+ This package contains the development files and headers to link to
+ this library.
Package: libccscript3-1.1-0
-Section: libs
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: GNU Common C++ framework for embedded scripting
The GNU ccScript package offers a class extensible threaded embedded
scripting engine for use with GNU Common C++. This engine is also used in
diff --git a/debian/copyright b/debian/copyright
index ac781f3..8293df5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,4 +25,4 @@ License:
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'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libccscript3-1.1-0.dirs b/debian/libccscript3-1.1-0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libccscript3-1.1-0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libccscript3-1.1-0.install b/debian/libccscript3-1.1-0.install
index 30a2d4f..494c614 100644
--- a/debian/libccscript3-1.1-0.install
+++ b/debian/libccscript3-1.1-0.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/lib/ccscript3-*/*
+usr/lib/*/lib*.so.*
+usr/lib/*/ccscript3-*/*
diff --git a/debian/libccscript3-dev.dirs b/debian/libccscript3-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libccscript3-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libccscript3-dev.install b/debian/libccscript3-dev.install
index 3c996c8..bcc93df 100644
--- a/debian/libccscript3-dev.install
+++ b/debian/libccscript3-dev.install
@@ -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
diff --git a/debian/patches/error_format_security.patch b/debian/patches/error_format_security.patch
new file mode 100644
index 0000000..50c5af0
--- /dev/null
+++ b/debian/patches/error_format_security.patch
@@ -0,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();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a791583
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+spelling-error-in-binary.patch
+dbug365518.patch
+error_format_security.patch
+gcc-4.3.patch
diff --git a/debian/patches/spelling-error-in-binary.patch b/debian/patches/spelling-error-in-binary.patch
new file mode 100644
index 0000000..c643290
--- /dev/null
+++ b/debian/patches/spelling-error-in-binary.patch
@@ -0,0 +1,103 @@
+Description: spelling-error-in-binary usr/lib/ccscript3-1.1/locker.dso aquired acquired
+Bug-Debian: http://lintian.debian.org/tags/spelling-error-in-binary.html
+
+Index: libccscript3-1.1.7/modules/locker.cpp
+===================================================================
+--- libccscript3-1.1.7.orig/modules/locker.cpp 2007-08-11 21:39:54.000000000 +1000
++++ libccscript3-1.1.7/modules/locker.cpp 2012-06-23 15:31:41.000000000 +1000
+@@ -67,14 +67,14 @@
+
+ public:
+ void release(const char *id, void *v);
+- bool aquire(const char *id, void *v);
++ bool acquire(const char *id, void *v);
+
+ LockerBinder();
+ static LockerBinder locker;
+ };
+
+ static Script::Define runtime[] = {
+- {"aquire", false, (Script::Method)&LockerMethods::scrAquire,
++ {"acquire", false, (Script::Method)&LockerMethods::scrAquire,
+ (Script::Check)&LockerChecks::chkAquire},
+ {"release", false, (Script::Method)&LockerMethods::scrRelease,
+ (Script::Check)&LockerChecks::chkRelease},
+@@ -95,7 +95,7 @@
+ return alloc(size);
+ }
+
+-bool LockerBinder::aquire(const char *id, void *v)
++bool LockerBinder::acquire(const char *id, void *v)
+ {
+ bool rtn = false;
+ void *dp;
+@@ -134,7 +134,7 @@
+ void LockerBinder::detach(ScriptInterp *interp)
+ {
+ Symbol *list[65];
+- unsigned count = interp->gathertype(list, 64, "aquired", symCONST);
++ unsigned count = interp->gathertype(list, 64, "acquired", symCONST);
+ unsigned idx = 0;
+ Symbol *sym;
+ char name[65];
+@@ -173,7 +173,7 @@
+ return true;
+ }
+
+- snprintf(name, sizeof(name), "aquired.%s", tag);
++ snprintf(name, sizeof(name), "acquired.%s", tag);
+ sym = mapSymbol(name, 32);
+ if(sym->type == symINITIAL)
+ sym->type = symCONST;
+@@ -192,7 +192,7 @@
+ }
+
+ snprintf(name, sizeof(name), "%s.%s", tag, id);
+- if(!LockerBinder::locker.aquire(name, this)) {
++ if(!LockerBinder::locker.acquire(name, this)) {
+ error("lock-used");
+ return false;
+ }
+@@ -222,7 +222,7 @@
+ tag = var;
+ }
+
+- snprintf(name, sizeof(name), "aquired.%s", tag);
++ snprintf(name, sizeof(name), "acquired.%s", tag);
+ sym = mapSymbol(name, 0);
+ if(!sym || sym->type != symCONST || !sym->data[0]) {
+ error("no-lock");
+@@ -250,17 +250,17 @@
+ const char *cp;
+
+ if(hasKeywords(line))
+- return "aquire has no keywords";
++ return "acquire has no keywords";
+
+ if(!getOption(line, &idx))
+- return "aquire needs id argument";
++ return "acquire needs id argument";
+
+ cp = getOption(line, &idx);
+ if(!cp)
+ return NULL;
+
+ if(getOption(line, &idx))
+- return "only one label for aquire";
++ return "only one label for acquire";
+
+ return NULL;
+ }
+Index: libccscript3-1.1.7/src/script3.h
+===================================================================
+--- libccscript3-1.1.7.orig/src/script3.h 2007-08-11 21:39:53.000000000 +1000
++++ libccscript3-1.1.7/src/script3.h 2012-06-23 15:30:52.000000000 +1000
+@@ -1517,7 +1517,7 @@
+ void attach(ScriptCommand *cmd, ScriptImage *img, Name *scr);
+
+ /**
+- * Release any aquired lock...
++ * Release any acquired lock...
+ */
+ void release(void);
+
diff --git a/debian/rules b/debian/rules
index 176f295..92ee809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-
+override_dh_install:
+ sed -i "/dependency_libs/ s/'.*'/''/" `find $(CURDIR)/debian -name '*.la'`
+ dh_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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libccscript3.git
More information about the Pkg-voip-commits
mailing list