r30987 - in /packages/unstable/libcroco/debian: changelog compat control control.in libcroco-tools.install libcroco3-dev.install libcroco3.install patches/01-croco-config.patch patches/02-format-security.patch patches/series rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Oct 22 23:24:19 UTC 2011
Author: biebl
Date: Sat Oct 22 23:24:18 2011
New Revision: 30987
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30987
Log:
* src/cr-statement.c, tests/test{2,3}-main.c: fix passing of variables to
printf() when we should have a format string, to be safe. The tests/
problems are false positives because we control the input, and no
existing reverse dependencies call cr_statement_dump*, but better safe
than sorry. Closes: #643419.
* Build for multiarch. Closes: #646061.
* Move csslint to a new libcroco-tools package, for multiarch cleanliness.
* croco-config.in: libdir is never used, so don't set it at all - this lets
the executable be the same across architectures and allows the -dev
package to be Multi-Arch: same.
* Switch to dpkg source format 3.0 (quilt).
Added:
packages/unstable/libcroco/debian/libcroco-tools.install
packages/unstable/libcroco/debian/patches/01-croco-config.patch
packages/unstable/libcroco/debian/patches/02-format-security.patch
packages/unstable/libcroco/debian/patches/series
Modified:
packages/unstable/libcroco/debian/changelog
packages/unstable/libcroco/debian/compat
packages/unstable/libcroco/debian/control
packages/unstable/libcroco/debian/control.in
packages/unstable/libcroco/debian/libcroco3-dev.install
packages/unstable/libcroco/debian/libcroco3.install
packages/unstable/libcroco/debian/rules
Modified: packages/unstable/libcroco/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/changelog?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/changelog [utf-8] (original)
+++ packages/unstable/libcroco/debian/changelog [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,10 +1,26 @@
libcroco (0.6.2-2) UNRELEASED; urgency=low
+ [ Emilio Pozuelo Monfort ]
* debian/control.in,
debian/rules:
+ Remove the chrpath hack, it's been fixed in libtool.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 11 Dec 2010 12:29:31 +0100
+ [ Steve Langasek ]
+ * src/cr-statement.c, tests/test{2,3}-main.c: fix passing of variables to
+ printf() when we should have a format string, to be safe. The tests/
+ problems are false positives because we control the input, and no
+ existing reverse dependencies call cr_statement_dump*, but better safe
+ than sorry. Closes: #643419.
+ * Build for multiarch. Closes: #646061.
+ * Move csslint to a new libcroco-tools package, for multiarch cleanliness.
+ * croco-config.in: libdir is never used, so don't set it at all - this lets
+ the executable be the same across architectures and allows the -dev
+ package to be Multi-Arch: same.
+
+ [ Michael Biebl ]
+ * Switch to dpkg source format 3.0 (quilt).
+
+ -- Michael Biebl <biebl at debian.org> Sun, 23 Oct 2011 01:23:30 +0200
libcroco (0.6.2-1) unstable; urgency=low
Modified: packages/unstable/libcroco/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/compat?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/compat [utf-8] (original)
+++ packages/unstable/libcroco/debian/compat [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,1 +1,1 @@
-6
+9
Modified: packages/unstable/libcroco/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/control?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/control [utf-8] (original)
+++ packages/unstable/libcroco/debian/control [utf-8] Sat Oct 22 23:24:18 2011
@@ -7,9 +7,9 @@
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: cdbs,
- debhelper (>= 6),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Build-Depends: cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3~),
gnome-pkg-tools (>= 0.7),
libxml2-dev (>= 2.4.23),
libglib2.0-dev (>= 2.0),
@@ -20,6 +20,7 @@
Package: libcroco3-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
libcroco3 (= ${binary:Version}),
@@ -30,18 +31,18 @@
* A parser module that provides
o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
API wich resembles SAX in the xml world.
- o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
.
- The libcroco parser implements the CSS Level 2 specification, the CSS
+ The libcroco parser implements the CSS Level 2 specification, the CSS
forward compatibility rules and the CSS cascading rules.
.
* A CSS2 selection engine
Given an xml element node (that obviously comes from an xml document) and
- a stylesheet cascade, the Libcroco selection engine can evaluate the css
- selectors of the cascade and return the style properties associated to
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
the xml element node.
.
- Note that the xml manipulation toolkit used by the libcroco selection
+ Note that the xml manipulation toolkit used by the libcroco selection
engine at the moment is libxml2.
.
This package contains the header files and static libraries which is
@@ -51,6 +52,8 @@
Package: libcroco3
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
@@ -58,18 +61,45 @@
* A parser module that provides
o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
API wich resembles SAX in the xml world.
- o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
.
- The libcroco parser implements the CSS Level 2 specification, the CSS
+ The libcroco parser implements the CSS Level 2 specification, the CSS
forward compatibility rules and the CSS cascading rules.
.
* A CSS2 selection engine
Given an xml element node (that obviously comes from an xml document) and
- a stylesheet cascade, the Libcroco selection engine can evaluate the css
- selectors of the cascade and return the style properties associated to
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
the xml element node.
.
- Note that the xml manipulation toolkit used by the libcroco selection
+ Note that the xml manipulation toolkit used by the libcroco selection
engine at the moment is libxml2.
.
This package contains the shared libraries.
+
+Package: libcroco-tools
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: Cascading Style Sheet (CSS) parsing and manipulation toolkit - utils
+ Services provided by Libcroco
+ * A parser module that provides
+ o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
+ API wich resembles SAX in the xml world.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ .
+ The libcroco parser implements the CSS Level 2 specification, the CSS
+ forward compatibility rules and the CSS cascading rules.
+ .
+ * A CSS2 selection engine
+ Given an xml element node (that obviously comes from an xml document) and
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
+ the xml element node.
+ .
+ Note that the xml manipulation toolkit used by the libcroco selection
+ engine at the moment is libxml2.
+ .
+ This package contains csslint, a standalone utility based on libcroco that
+ can be used for testing CSS correctness.
Modified: packages/unstable/libcroco/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/control.in?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/control.in [utf-8] (original)
+++ packages/unstable/libcroco/debian/control.in [utf-8] Sat Oct 22 23:24:18 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
- debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3~),
gnome-pkg-tools (>= 0.7),
libxml2-dev (>= 2.4.23),
libglib2.0-dev (>= 2.0),
@@ -15,6 +15,7 @@
Package: libcroco3-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
libcroco3 (= ${binary:Version}),
@@ -25,18 +26,18 @@
* A parser module that provides
o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
API wich resembles SAX in the xml world.
- o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
.
- The libcroco parser implements the CSS Level 2 specification, the CSS
+ The libcroco parser implements the CSS Level 2 specification, the CSS
forward compatibility rules and the CSS cascading rules.
.
* A CSS2 selection engine
Given an xml element node (that obviously comes from an xml document) and
- a stylesheet cascade, the Libcroco selection engine can evaluate the css
- selectors of the cascade and return the style properties associated to
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
the xml element node.
.
- Note that the xml manipulation toolkit used by the libcroco selection
+ Note that the xml manipulation toolkit used by the libcroco selection
engine at the moment is libxml2.
.
This package contains the header files and static libraries which is
@@ -46,6 +47,8 @@
Package: libcroco3
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
@@ -53,18 +56,45 @@
* A parser module that provides
o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
API wich resembles SAX in the xml world.
- o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
.
- The libcroco parser implements the CSS Level 2 specification, the CSS
+ The libcroco parser implements the CSS Level 2 specification, the CSS
forward compatibility rules and the CSS cascading rules.
.
* A CSS2 selection engine
Given an xml element node (that obviously comes from an xml document) and
- a stylesheet cascade, the Libcroco selection engine can evaluate the css
- selectors of the cascade and return the style properties associated to
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
the xml element node.
.
- Note that the xml manipulation toolkit used by the libcroco selection
+ Note that the xml manipulation toolkit used by the libcroco selection
engine at the moment is libxml2.
.
This package contains the shared libraries.
+
+Package: libcroco-tools
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: Cascading Style Sheet (CSS) parsing and manipulation toolkit - utils
+ Services provided by Libcroco
+ * A parser module that provides
+ o A SAC like API. SAC stands for Simple API for CSS. SAC is an event driven
+ API wich resembles SAX in the xml world.
+ o A CSSOM like API. CSSOM stands for Cascading Style Sheet Object Model.
+ .
+ The libcroco parser implements the CSS Level 2 specification, the CSS
+ forward compatibility rules and the CSS cascading rules.
+ .
+ * A CSS2 selection engine
+ Given an xml element node (that obviously comes from an xml document) and
+ a stylesheet cascade, the Libcroco selection engine can evaluate the css
+ selectors of the cascade and return the style properties associated to
+ the xml element node.
+ .
+ Note that the xml manipulation toolkit used by the libcroco selection
+ engine at the moment is libxml2.
+ .
+ This package contains csslint, a standalone utility based on libcroco that
+ can be used for testing CSS correctness.
Added: packages/unstable/libcroco/debian/libcroco-tools.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/libcroco-tools.install?rev=30987&op=file
==============================================================================
--- packages/unstable/libcroco/debian/libcroco-tools.install (added)
+++ packages/unstable/libcroco/debian/libcroco-tools.install [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,0 +1,1 @@
+usr/bin/csslint*
Modified: packages/unstable/libcroco/debian/libcroco3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/libcroco3-dev.install?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/libcroco3-dev.install [utf-8] (original)
+++ packages/unstable/libcroco/debian/libcroco3-dev.install [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,6 +1,6 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/bin/croco*config
+usr/include
+usr/lib/*/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/*.la
+usr/lib/*/*.a
+usr/bin/croco*config
Modified: packages/unstable/libcroco/debian/libcroco3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/libcroco3.install?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/libcroco3.install [utf-8] (original)
+++ packages/unstable/libcroco/debian/libcroco3.install [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,2 +1,1 @@
-debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/bin/csslint*
+usr/lib/*/*.so.*
Added: packages/unstable/libcroco/debian/patches/01-croco-config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/patches/01-croco-config.patch?rev=30987&op=file
==============================================================================
--- packages/unstable/libcroco/debian/patches/01-croco-config.patch (added)
+++ packages/unstable/libcroco/debian/patches/01-croco-config.patch [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,0 +1,12 @@
+diff --git a/croco-config.in b/croco-config.in
+index 78911ff..52e2b96 100644
+--- a/croco-config.in
++++ b/croco-config.in
+@@ -4,7 +4,6 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ includedir=@includedir@
+-libdir=@libdir@
+
+ usage()
+ {
Added: packages/unstable/libcroco/debian/patches/02-format-security.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/patches/02-format-security.patch?rev=30987&op=file
==============================================================================
--- packages/unstable/libcroco/debian/patches/02-format-security.patch (added)
+++ packages/unstable/libcroco/debian/patches/02-format-security.patch [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,0 +1,111 @@
+diff --git a/src/cr-statement.c b/src/cr-statement.c
+index a1b8259..cb9b11c 100644
+--- a/src/cr-statement.c
++++ b/src/cr-statement.c
+@@ -2611,7 +2611,7 @@ cr_statement_dump_ruleset (CRStatement const * a_this, FILE * a_fp, glong a_inde
+ g_return_if_fail (a_fp && a_this);
+ str = cr_statement_ruleset_to_string (a_this, a_indent);
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str);
+ str = NULL;
+ }
+@@ -2662,7 +2662,7 @@ cr_statement_dump_charset (CRStatement const * a_this, FILE * a_fp, gulong a_ind
+ str = cr_statement_charset_to_string (a_this,
+ a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2689,7 +2689,7 @@ cr_statement_dump_page (CRStatement const * a_this, FILE * a_fp, gulong a_indent
+
+ str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2715,7 +2715,7 @@ cr_statement_dump_media_rule (CRStatement const * a_this,
+
+ str = cr_statement_media_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2741,7 +2741,7 @@ cr_statement_dump_import_rule (CRStatement const * a_this, FILE * a_fp,
+
+ str = cr_statement_import_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+diff --git a/tests/test2-main.c b/tests/test2-main.c
+index 0a576a5..a0ddf9e 100644
+--- a/tests/test2-main.c
++++ b/tests/test2-main.c
+@@ -130,7 +130,7 @@ test_import_style (CRDocHandler * a_handler,
+ ((CRString *) cur->data)->stryng->len);
+
+ if (str) {
+- fprintf (stdout, str);
++ fprintf (stdout, "%s", str);
+ fprintf (stdout, "\n");
+ g_free (str);
+ str = NULL;
+@@ -145,7 +145,7 @@ test_import_style (CRDocHandler * a_handler,
+ guchar *str = cr_string_dup2
+ (a_uri_default_ns) ;
+ if (str) {
+- fprintf (stdout, str);
++ fprintf (stdout, "%s", str);
+ fprintf (stdout, "\n");
+ g_free (str);
+ str = NULL;
+@@ -270,7 +270,7 @@ test_property (CRDocHandler * a_handler,
+ a_name->stryng->len);
+
+ if (name) {
+- fprintf (stdout, name);
++ fprintf (stdout, "%s", name);
+ }
+ if (a_expr) {
+ fprintf (stdout, ": ");
+diff --git a/tests/test3-main.c b/tests/test3-main.c
+index f2c69c9..ef7f4a6 100644
+--- a/tests/test3-main.c
++++ b/tests/test3-main.c
+@@ -123,7 +123,7 @@ test_import_style (CRDocHandler * a_handler,
+ guchar *str =
+ cr_string_dup2 ((CRString *) cur->data);
+ if (str) {
+- fprintf (stdout, str);
++ fprintf (stdout, "%s", str);
+ fprintf (stdout, "\n");
+ g_free (str);
+ str = NULL;
+@@ -136,7 +136,7 @@ test_import_style (CRDocHandler * a_handler,
+ if (a_uri_default_ns) {
+ guchar *str = cr_string_dup2 (a_uri_default_ns) ;
+ if (str) {
+- fprintf (stdout, str);
++ fprintf (stdout, "%s", str);
+ fprintf (stdout, "\n");
+ g_free (str);
+ str = NULL;
+@@ -255,7 +255,7 @@ test_property (CRDocHandler * a_handler, CRString * a_name,
+ if (a_name) {
+ guchar *name = cr_string_dup2 (a_name);
+ if (name) {
+- fprintf (stdout, name);
++ fprintf (stdout, "%s", name);
+ }
+ if (a_expr) {
+ fprintf (stdout, ": ");
Added: packages/unstable/libcroco/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/patches/series?rev=30987&op=file
==============================================================================
--- packages/unstable/libcroco/debian/patches/series (added)
+++ packages/unstable/libcroco/debian/patches/series [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,0 +1,2 @@
+01-croco-config.patch
+02-format-security.patch
Modified: packages/unstable/libcroco/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libcroco/debian/rules?rev=30987&op=diff
==============================================================================
--- packages/unstable/libcroco/debian/rules [utf-8] (original)
+++ packages/unstable/libcroco/debian/rules [utf-8] Sat Oct 22 23:24:18 2011
@@ -1,7 +1,6 @@
#! /usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -10,3 +9,4 @@
DEB_DH_MAKESHLIBS_ARGS_ALL += -V
DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
More information about the pkg-gnome-commits
mailing list