summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosselin Mouette <joss@debian.org>2010-10-19 06:46:05 (GMT)
committerCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-04-27 12:04:32 (GMT)
commit0252312789f9438c3d4fdb32e7334f695022e7af (patch)
treea078b490483dbd6964eb9b37e201d4dac42b571a
parent13031d91f622962df4a5146f99a3a40bd667cec6 (diff)
downloadlibproxy-0252312789f9438c3d4fdb32e7334f695022e7af.tar.gz
libproxy-0252312789f9438c3d4fdb32e7334f695022e7af.tar.xz
Imported Debian patch 0.3.1-2
-rw-r--r--debian/changelog95
-rw-r--r--debian/compat1
-rw-r--r--debian/control78
-rw-r--r--debian/control.in73
-rw-r--r--debian/copyright59
-rw-r--r--debian/libproxy-dev.install3
-rw-r--r--debian/libproxy-tools.install1
-rw-r--r--debian/libproxy0.install2
-rw-r--r--debian/patches/01_pac_http.patch25
-rw-r--r--debian/python-libproxy.install1
-rwxr-xr-xdebian/rules20
-rw-r--r--debian/watch4
12 files changed, 362 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..32c31c6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,95 @@
+libproxy (0.3.1-2) unstable; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/libproxy_link_against_libdl.patch:
+ - Removed, configure.ac already adds the correct check so this is not
+ needed anymore.
+
+ [ Josselin Mouette ]
+ * 01_pac_http.patch: new patch from Julien Blache. Don’t assume HTTP
+ header names are case sensitive. Closes: #600196.
+ * Re-enable webkit support. The build-dependency loop is not a problem
+ for a stable release. (But the issue will arise again later.)
+ * Recommend libwebkit-1.0-2 | libmozjs2d. Closes: #597864.
+
+ -- Josselin Mouette <joss@debian.org> Tue, 19 Oct 2010 08:46:05 +0200
+
+libproxy (0.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes crash when parsing .pac file. Closes: #550179.
+ - debian/patches/10_configure-check-for-dbus.patch,
+ debian/patches/60_am-prog-cc-c-o.patch:
+ + Removed, fixed upstream.
+ - debian/control.in:
+ + Build depend on gconf2 instead of libgconf2-dev.
+ + Build depend on kdelibs5-dev and libqt4-dev for the KDE4 plugin.
+ - debian/patches/50_px-wpad-fallback-env-var.patch,
+ debian/rules:
+ + Remove patch, don't install wpad_dnsdevolution.so now.
+ - debian/patches/70_autotools.patch:
+ + Removed, no longer needed.
+ - debian/libproxy0.install,
+ debian/rules:
+ + s/plugins/modules/ following the upstream change.
+ * debian/control.in:
+ - Update my maintainer email address.
+ - Standards-Version is 3.8.3, no changes needed.
+ - libproxy-tools is section utils.
+ * debian/watch:
+ - Look for bzip2 tarballs.
+ * debian/patches/libproxy_link_against_libdl.patch:
+ - Link with -ldl for dlopen et al. Closes: #558920.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Sat, 12 Dec 2009 01:56:54 +0100
+
+libproxy (0.2.3-4) unstable; urgency=low
+
+ * Don't build NetworkManager support on non-Linux platforms. Thanks
+ Samuel Thibault. Closes: #534939.
+ * Standards-Version is 3.8.2, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Sun, 28 Jun 2009 20:35:04 +0200
+
+libproxy (0.2.3-3) unstable; urgency=low
+
+ * Stop building the webkit plugin for now, we have a circular build-
+ dependency with webkit. Instead, build the mozjs one, so that we can
+ still read PAC files.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Wed, 29 Apr 2009 20:55:50 +0200
+
+libproxy (0.2.3-2) unstable; urgency=low
+
+ * debian/patches/50_px-wpad-fallback-env-var.patch:
+ - Fix logic to not bypass the config plugin when the env variable
+ isn't set. We don't do wpad fallback if the env variable isn't set,
+ but there's not reason to ignore the config file if one is provided.
+ See https://launchpad.net/bugs/354475.
+ * Standards-Version is 3.8.1, no changes needed.
+ * debian/copyright: Add copyright note for pacutils.js
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Sat, 25 Apr 2009 14:25:10 +0200
+
+libproxy (0.2.3-1) unstable; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
+ * Initial release (Closes: #509063).
+ * Fix if/else logic and a wrong free in 50_px-wpad-fallback-env-var.
+
+ [ Loic Minier ]
+ * Set libproxy-dev Arch: any; too small win to warrant installability issues
+ on slow arches.
+ * Drop shlibs:Depends from python-libproxy as it's Arch: all.
+ * Drop gnome-get-source.mk include as it's not working by default.
+ * Rename patch configure_check_for_dbus to 10_configure-check-for-dbus.
+ * Run a full autoreconf instead of only autoconf.
+ - New patch, 60_am-prog-cc-c-o, makes newer autoconfs happier.
+ - New patch, 70_autotools, split autotools generated files here to force
+ them to be applied last and avoid timestamp skews issues.
+ Thanks Sébastien Bacher and Ubuntu for the above.
+ * New patch, 50_px-wpad-fallback-env-var, check PX_WPAD_FALLBACK env var to
+ decide whether to fall back to wpad:// style autodetection or not,
+ defaulting to not fallback when the env var isn't set.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Tue, 03 Mar 2009 01:11:35 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..9b74ad3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,78 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: libproxy
+Section: libs
+Priority: optional
+Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>
+Build-Depends: cdbs,
+ debhelper (>= 5),
+ gnome-pkg-tools,
+ autotools-dev,
+ python-all-dev,
+ python-support,
+ network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libdbus-1-dev,
+ libmozjs-dev,
+ kdelibs5-dev,
+ libqt4-dev,
+# /!\ we have a build-depends loop with webkit
+ libwebkit-dev,
+ gconf2,
+ libxmu-dev
+Standards-Version: 3.8.3
+XS-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/
+
+Package: libproxy0
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: libwebkit-1.0-2 | libmozjs2d
+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.
+ .
+ This package contains the shared library.
+
+Package: libproxy-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy0 (= ${binary:Version})
+Description: automatic proxy configuration management library (devel)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the development files.
+
+Package: libproxy-tools
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: automatic proxy configuration management library (tools)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains a program to interact with libproxy from the
+ command line.
+
+Package: python-libproxy
+Architecture: all
+Section: python
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ libproxy0 (>= ${source:Version})
+Description: automatic proxy configuration management library (python)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the Python bindings.
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..4b1db5d
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,73 @@
+Source: libproxy
+Section: libs
+Priority: optional
+Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs,
+ debhelper (>= 5),
+ gnome-pkg-tools,
+ autotools-dev,
+ python-all-dev,
+ python-support,
+ network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libdbus-1-dev,
+ libmozjs-dev,
+ kdelibs5-dev,
+ libqt4-dev,
+# /!\ we have a build-depends loop with webkit
+ libwebkit-dev,
+ gconf2,
+ libxmu-dev
+Standards-Version: 3.8.3
+XS-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/
+
+Package: libproxy0
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: libwebkit-1.0-2 | libmozjs2d
+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.
+ .
+ This package contains the shared library.
+
+Package: libproxy-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy0 (= ${binary:Version})
+Description: automatic proxy configuration management library (devel)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the development files.
+
+Package: libproxy-tools
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: automatic proxy configuration management library (tools)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains a program to interact with libproxy from the
+ command line.
+
+Package: python-libproxy
+Architecture: all
+Section: python
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ libproxy0 (>= ${source:Version})
+Description: automatic proxy configuration management library (python)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the Python bindings.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ab4beee
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Emilio Pozuelo Monfort <pochu@ubuntu.com> on
+Wed, 17 Dec 2008 23:25:40 +0100.
+
+It was downloaded from http://code.google.com/p/libproxy/downloads/list
+
+Upstream Authors:
+
+ Nathaniel McCallum <nathaniel@natemccallum.com>
+ Alex Panait <kippled@gmail.com>
+
+Copyright:
+
+ Copyright (C) 2006 Nathaniel McCallum <nathaniel@natemccallum.com>
+
+ The file pacutils.js is:
+ Copyright (c) Netscape Communications Corporation. 1998
+
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is copyright 2008, Emilio Pozuelo Monfort <pochu@ubuntu.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+
+For src/plugins/xhasclient.c, the following applies:
+ Copyright 1989, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/libproxy-dev.install b/debian/libproxy-dev.install
new file mode 100644
index 0000000..c930bcd
--- /dev/null
+++ b/debian/libproxy-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/libproxy.so
diff --git a/debian/libproxy-tools.install b/debian/libproxy-tools.install
new file mode 100644
index 0000000..451ddc0
--- /dev/null
+++ b/debian/libproxy-tools.install
@@ -0,0 +1 @@
+debian/tmp/usr/bin
diff --git a/debian/libproxy0.install b/debian/libproxy0.install
new file mode 100644
index 0000000..f2ea5e7
--- /dev/null
+++ b/debian/libproxy0.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libproxy.so.*
+debian/tmp/usr/lib/libproxy/*/modules
diff --git a/debian/patches/01_pac_http.patch b/debian/patches/01_pac_http.patch
new file mode 100644
index 0000000..5f1e951
--- /dev/null
+++ b/debian/patches/01_pac_http.patch
@@ -0,0 +1,25 @@
+diff -ru orig/libproxy-0.3.1/src/lib/pac.c libproxy-0.3.1/src/lib/pac.c
+--- orig/libproxy-0.3.1/src/lib/pac.c 2009-09-29 21:52:50.000000000 +0200
++++ libproxy-0.3.1/src/lib/pac.c 2010-10-14 16:13:58.273700566 +0200
+@@ -19,6 +19,7 @@
+
+ #include <unistd.h>
+ #include <string.h>
++#include <strings.h>
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -145,11 +146,11 @@
+ /* Check for correct mime type and content length */
+ while (strcmp(line, "\r")) {
+ /* Check for content type */
+- if (strstr(line, "Content-Type: ") == line && strstr(line, PAC_MIME_TYPE))
++ if (strncasecmp(line, "Content-Type:", strlen("Content-Type:")) == 0 && strstr(line, PAC_MIME_TYPE))
+ correct_mime_type = true;
+
+ /* Check for content length */
+- else if (strstr(line, "Content-Length: ") == line)
++ else if (strncasecmp(line, "Content-Length:", strlen("Content-Length:")) == 0)
+ content_length = atoi(line + strlen("Content-Length: "));
+
+ /* Get new line */
diff --git a/debian/python-libproxy.install b/debian/python-libproxy.install
new file mode 100644
index 0000000..80f0c2a
--- /dev/null
+++ b/debian/python-libproxy.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..dba7b06
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+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
+
+SHLIBVER := 0.2.3
+libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+
+DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
+DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
+
+binary-install/python-libproxy::
+ dh_pysupport -p$(cdbs_curpkg)
+
+binary-install/$(libproxy)::
+ rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ab098ca
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+
+http://code.google.com/p/libproxy/downloads/list \
+ http://libproxy.googlecode.com/files/libproxy-(.*).tar.bz2