r29479 - in /packages/unstable/libproxy/debian: changelog control control.in patches/02_url_user.patch patches/series rules source/ source/format
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Aug 23 21:12:09 UTC 2011
Author: joss
Date: Tue Aug 23 21:12:09 2011
New Revision: 29479
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29479
Log:
* Migrate to libwebkitgtk* dependencies. Closes: #635416.
* Migrate to dh_python2. Closes: #635140.
* Build-depend on mozjs >= 6, require libmozjs6d. Closes: #638942.
* Switch to 3.0 quilt format.
* 02_url_user.patch: patch from Florian Echtler to fix incorrect
parsing of URLs containing user and port but no password.
Closes: #635684.
Added:
packages/unstable/libproxy/debian/patches/02_url_user.patch
packages/unstable/libproxy/debian/patches/series
packages/unstable/libproxy/debian/source/
packages/unstable/libproxy/debian/source/format
Modified:
packages/unstable/libproxy/debian/changelog
packages/unstable/libproxy/debian/control
packages/unstable/libproxy/debian/control.in
packages/unstable/libproxy/debian/rules
Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=29479&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Tue Aug 23 21:12:09 2011
@@ -1,8 +1,15 @@
-libproxy (0.3.1-3) UNRELEASED; urgency=low
+libproxy (0.3.1-3) unstable; urgency=low
* Use linux-any wildcard. Closes: #634464.
+ * Migrate to libwebkitgtk* dependencies. Closes: #635416.
+ * Migrate to dh_python2. Closes: #635140.
+ * Build-depend on mozjs >= 6, require libmozjs6d. Closes: #638942.
+ * Switch to 3.0 quilt format.
+ * 02_url_user.patch: patch from Florian Echtler to fix incorrect
+ parsing of URLs containing user and port but no password.
+ Closes: #635684.
- -- Josselin Mouette <joss at debian.org> Sun, 17 Jul 2011 10:49:30 +0200
+ -- Josselin Mouette <joss at debian.org> Tue, 23 Aug 2011 23:11:55 +0200
libproxy (0.3.1-2) unstable; urgency=low
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=29479&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Tue Aug 23 21:12:09 2011
@@ -12,19 +12,18 @@
debhelper (>= 5),
gnome-pkg-tools,
autotools-dev,
- python-all-dev,
- python-support,
+ python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-dev,
- libmozjs-dev,
+ libmozjs-dev (>= 6),
kdelibs5-dev,
libqt4-dev,
# /!\ we have a build-depends loop with webkit
- libwebkit-dev,
+ libwebkitgtk-dev,
gconf2,
libxmu-dev
Standards-Version: 3.8.3
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libproxy
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libproxy
Homepage: http://code.google.com/p/libproxy/
@@ -33,7 +32,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: libwebkit-1.0-2 | libmozjs2d
+Recommends: libwebkitgtk-1.0-0 | libmozjs6d
Description: automatic proxy configuration management library (shared)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
@@ -67,7 +66,6 @@
Package: python-libproxy
Architecture: all
Section: python
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
libproxy0 (>= ${source:Version})
Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=29479&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Tue Aug 23 21:12:09 2011
@@ -7,19 +7,18 @@
debhelper (>= 5),
gnome-pkg-tools,
autotools-dev,
- python-all-dev,
- python-support,
+ python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-dev,
- libmozjs-dev,
+ libmozjs-dev (>= 6),
kdelibs5-dev,
libqt4-dev,
# /!\ we have a build-depends loop with webkit
- libwebkit-dev,
+ libwebkitgtk-dev,
gconf2,
libxmu-dev
Standards-Version: 3.8.3
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libproxy
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libproxy
Homepage: http://code.google.com/p/libproxy/
@@ -28,7 +27,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: libwebkit-1.0-2 | libmozjs2d
+Recommends: libwebkitgtk-1.0-0 | libmozjs6d
Description: automatic proxy configuration management library (shared)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
@@ -62,7 +61,6 @@
Package: python-libproxy
Architecture: all
Section: python
-XB-Python-Version: ${python:Versions}
Depends: ${python:Depends},
${misc:Depends},
libproxy0 (>= ${source:Version})
Added: packages/unstable/libproxy/debian/patches/02_url_user.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/02_url_user.patch?rev=29479&op=file
==============================================================================
--- packages/unstable/libproxy/debian/patches/02_url_user.patch (added)
+++ packages/unstable/libproxy/debian/patches/02_url_user.patch [utf-8] Tue Aug 23 21:12:09 2011
@@ -1,0 +1,39 @@
+diff -ur libproxy-0.3.1-old/src/lib/url.c libproxy-0.3.1/src/lib/url.c
+--- libproxy-0.3.1-old/src/lib/url.c 2009-09-29 21:52:50.000000000 +0200
++++ libproxy-0.3.1/src/lib/url.c 2011-07-28 09:44:01.318668280 +0200
+@@ -300,13 +300,20 @@
+ start += strlen(self->scheme) + 3;
+
+ /* If we have a username and password */
+- if (strchr(start, '@') && (strchr(start, '/') > strchr(start, '@') || strchr(start, '/') == NULL))
++ char* atpos = strchr(start,'@');
++ char* slashpos = strchr(start,'/');
++ char* colpos = strchr(start,':');
++ if (atpos && (slashpos > atpos || slashpos == NULL))
+ {
+- if (!strchr(start, ':')) goto error; // Can't find user/pass delimiter
+- self->username = px_strndup(start, strchr(start, ':') - start);
+- start += strlen(self->username) + 1;
+- self->password = px_strndup(start, strchr(start, '@') - start);
+- start += strlen(self->password) + 1;
++ if (colpos > atpos || colpos == NULL) { // we have user (and possibly port), but no pass
++ self->username = px_strndup(start, atpos - start);
++ start += strlen(self->username) + 1;
++ } else { // regular user and pass
++ self->username = px_strndup(start, colpos - start);
++ start += strlen(self->username) + 1;
++ self->password = px_strndup(start, atpos - start);
++ start += strlen(self->password) + 1;
++ }
+ }
+
+ /* Get host */
+@@ -337,6 +344,8 @@
+ self->url = px_malloc0(strlen(url) + 1);
+ if (self->username && self->password)
+ snprintf(self->url, strlen(url) + 1, "%s://%s:%s@%s", self->scheme, self->username, self->password, self->host);
++ else if (self->username)
++ snprintf(self->url, strlen(url) + 1, "%s://%s@%s", self->scheme, self->username, self->host);
+ else
+ snprintf(self->url, strlen(url) + 1, "%s://%s", self->scheme, self->host);
+ if (port_specified)
Added: packages/unstable/libproxy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/series?rev=29479&op=file
==============================================================================
--- packages/unstable/libproxy/debian/patches/series (added)
+++ packages/unstable/libproxy/debian/patches/series [utf-8] Tue Aug 23 21:12:09 2011
@@ -1,0 +1,2 @@
+01_pac_http.patch
+02_url_user.patch
Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=29479&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Tue Aug 23 21:12:09 2011
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/class/autotools.mk
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
@@ -14,7 +13,7 @@
DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
binary-install/python-libproxy::
- dh_pysupport -p$(cdbs_curpkg)
+ dh_python2 -p$(cdbs_curpkg)
binary-install/$(libproxy)::
rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so
Added: packages/unstable/libproxy/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/source/format?rev=29479&op=file
==============================================================================
--- packages/unstable/libproxy/debian/source/format (added)
+++ packages/unstable/libproxy/debian/source/format [utf-8] Tue Aug 23 21:12:09 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list