Bug#683640: cntlm: please upgrade to source format 3.0 (quilt)

2024-02-18 Thread Bastian Germann 

I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.diff -Nru cntlm-0.92.3/debian/changelog cntlm-0.92.3/debian/changelog
--- cntlm-0.92.3/debian/changelog   2024-02-18 17:09:07.0 +
+++ cntlm-0.92.3/debian/changelog   2024-02-18 16:59:48.0 +
@@ -1,3 +1,11 @@
+cntlm (0.92.3-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0. Closes: #683640.
+  * d/copyright: Convert to machine-readable format.
+
+ -- Bastian Germann   Sun, 18 Feb 2024 16:59:48 +
+
 cntlm (0.92.3-1.2) unstable; urgency=medium
 
   [ Gianfranco Costamagna ]
@@ -61,7 +69,7 @@
 
  -- David Watson   Tue, 08 Jan 2008 23:34:29 +
 
-cntlm (0.35.1-1) unstable; urgency=low 
+cntlm (0.35.1-1) unstable; urgency=low
 
   [ David Kubicek ] 
   * New upstream release
@@ -147,4 +155,3 @@
   * Makefile adjustments regarding installation directories
 
  -- David Kubicek   Fri, 01 Jun 2007 17:36:34 +0200
-
diff -Nru cntlm-0.92.3/debian/copyright cntlm-0.92.3/debian/copyright
--- cntlm-0.92.3/debian/copyright   2024-02-18 17:09:07.0 +
+++ cntlm-0.92.3/debian/copyright   2024-02-18 16:59:48.0 +
@@ -1,32 +1,36 @@
-This package was debianized by David Kubicek  on
-Fri, 01 Jun 2007 10:46:26 +0200.
-
-The current Debian maintainer is David Watson 
-
-It was downloaded from 
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Comment:
+ This package was debianized by David Kubicek  on
+ Fri, 01 Jun 2007 10:46:26 +0200.
+ .
+ The current Debian maintainer is David Watson 
+Source:
+ 
 
+Files: *
 Copyright: 
-
 Copyright (C) 2007 David Kubicek
-
-License:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License (version 2) as published
-by the Free Software Foundation; either version 2 of the License.
-
-This program 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License with
-the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-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 General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-The Debian packaging is Copyright (C) 2007, David Kubicek  and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License (version 2) as published
+ by the Free Software Foundation; either version 2 of the License,
+ or (at your option) any later version.
+ .
+ This program 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License with
+ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+ if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301, USA.
+Comment:
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+Files: debian/*
+Copyright: (C) 2007, David Kubicek 
+License: GPL-2
+ The Debian packaging is licensed under the GPL,
+ see `/usr/share/common-licenses/GPL-2'.
diff -Nru cntlm-0.92.3/debian/patches/debian.patch 
cntlm-0.92.3/debian/patches/debian.patch
--- cntlm-0.92.3/debian/patches/debian.patch1970-01-01 00:00:00.0 
+
+++ cntlm-0.92.3/debian/patches/debian.patch2024-02-18 16:59:48.0 
+
@@ -0,0 +1,226 @@
+--- cntlm-0.92.3.orig/direct.c
 cntlm-0.92.3/direct.c
+@@ -282,8 +282,19 @@ rr_data_t direct_request(void *cdata, rr
+   data[0]->url = strdup(data[0]->rel_url);
+   }
+ 
+-  data[0]->headers = hlist_mod(data[0]->headers, 
"Connection", "keep-alive", 1);
+-  data[0]->headers = hlist_del(data[0]->headers, 
"Proxy-Authorization");
++  /*
++   * Force proxy keep-alive if the client can 
handle it (HTTP >= 1.1)
++   */
++  if (data[0]->http_version >= 11)
++  data[0]->headers = 
hlist_mod(data[0]->headers, "Connection", "keep-alive", 1);
++
++  /*
++

Bug#683640: cntlm: please upgrade to source format 3.0 (quilt)

2012-08-02 Thread Graham Inggs 

Package: cntlm
Version: 0.92.3-1
Severity: wishlist

Please consider upgrading to source format 3.0 (quilt), it makes it easier for 
packagers of Debian derivatives to manage patches.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org