[Pkg-cracklib-commits] r27 - in cracklib2/trunk/debian: . patches

jandd-guest at alioth.debian.org jandd-guest at alioth.debian.org
Thu Jul 10 19:28:43 UTC 2008 

Author: jandd-guest
Date: 2008-07-10 19:28:42 +0000 (Thu, 10 Jul 2008)
New Revision: 27

Added:
   cracklib2/trunk/debian/patches/
   cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
   cracklib2/trunk/debian/patches/02-ccwarnings.patch
   cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
   cracklib2/trunk/debian/patches/series
Modified:
   cracklib2/trunk/debian/changelog
   cracklib2/trunk/debian/control
   cracklib2/trunk/debian/rules
Log:
* applied patches by Martin Pitt
* add quilt patch system
* update changelog


Modified: cracklib2/trunk/debian/changelog
===================================================================
--- cracklib2/trunk/debian/changelog	2008-07-01 20:20:27 UTC (rev 26)
+++ cracklib2/trunk/debian/changelog	2008-07-10 19:28:42 UTC (rev 27)
@@ -1,10 +1,8 @@
-cracklib2 (2.8.12-1) experimental; urgency=low
+cracklib2 (2.8.12-1) unstable; urgency=low
 
   * switch to new upstream branch (Closes: #355692)
   * update copyright file to reflect the change from an Artistic License
     derivative license to the GPL-2 and mention new upstream
-  * removed Debian patches that are no longer required because of upstream
-    improvements
   * debian/rules
     + switch from cdbs to debhelper
     + change default dictionary path to /var/lib/cracklib/pw_dict
@@ -14,7 +12,7 @@
     + add Homepage field
     + provide a new binary package python-cracklib using python-central
     + add Build-Depends for python-all, python-all-dev, python-central,
-      and chrpath
+      quilt, and chrpath
     + add XS-Python and XB-Python fields to debian/control
     + rename binary package cracklib2 to libcrack2 and cracklib2-dev to
       libcrack2-dev, add the corresponding Provides, Conflicts and
@@ -38,8 +36,18 @@
   * fix man2html URLs in documentation to reflect man2html's current URL
     syntax
   * add README, README-DAWG, and README-WORDS from upstream package
+  * add quilt rules to debian/rules
+  * removed some Debian patches that are no longer required because of
+    upstream improvements
+  * debian/patches/05-mkdict.patch: Adapted to new upstream version,
+    renamed to 01-cracklib-format-optim.patch.
+  * debian/patches/07-ccwarnings.patch: Adapted to new upstream version,
+    renamed to 02-ccwarnings.patch.
+  * debian/patches/12-packer-dont-print-skipping-line.c.patch: Adapted to
+    new upstream version, renamed to
+    03-packer-dont-print-skipping-line.patch.
 
- -- Jan Dittberner <jan at dittberner.info>  Mon, 30 Jun 2008 14:45:31 +0200
+ -- Jan Dittberner <jan at dittberner.info>  Thu, 10 Jul 2008 21:20:38 +0200
 
 cracklib2 (2.7-19.1) unstable; urgency=low
 

Modified: cracklib2/trunk/debian/control
===================================================================
--- cracklib2/trunk/debian/control	2008-07-01 20:20:27 UTC (rev 26)
+++ cracklib2/trunk/debian/control	2008-07-10 19:28:42 UTC (rev 27)
@@ -4,8 +4,8 @@
 Maintainer: Jan Dittberner <jan at dittberner.info>
 Uploaders: Martin Pitt <mpitt at debian.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4.0.0), python-central (>=0.6.7),
- python-all-dev, python-all, chrpath, xmlto
+Build-Depends: debhelper (>= 4.0.0), python-central (>= 0.6.7),
+ python-all-dev, python-all, chrpath, xmlto, quilt(>= 0.4)
 Homepage: http://sourceforge.net/projects/cracklib
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/pkg-cracklib/cracklib2/trunk

Added: cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
===================================================================
--- cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch	                        (rev 0)
+++ cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch	2008-07-10 19:28:42 UTC (rev 27)
@@ -0,0 +1,14 @@
+--- a/util/cracklib-format
++++ b/util/cracklib-format
+@@ -4,9 +4,7 @@
+ # into cracklib-packer
+ #
+ gzip -cdf "$@" |
++    grep -v '^\(#\|$\)' |
+     tr '[A-Z]' '[a-z]' |
+     tr -cd '\012[a-z][0-9]' |
+-    sort |
+-    uniq |
+-    grep -v '^#' |
+-    grep -v '^$'
++    sort -u

Added: cracklib2/trunk/debian/patches/02-ccwarnings.patch
===================================================================
--- cracklib2/trunk/debian/patches/02-ccwarnings.patch	                        (rev 0)
+++ cracklib2/trunk/debian/patches/02-ccwarnings.patch	2008-07-10 19:28:42 UTC (rev 27)
@@ -0,0 +1,73 @@
+--- a/lib/packlib.c
++++ b/lib/packlib.c
+@@ -12,7 +12,7 @@
+ #endif
+ #include "packer.h"
+ 
+-static char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
++static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
+ 
+ #define DEBUG 0
+ 
+--- a/lib/rules.c
++++ b/lib/rules.c
+@@ -4,7 +4,7 @@
+  * or its effect upon hardware or computer systems.
+  */
+ 
+-static char vers_id[] = "rules.c : v5.0p3 Alec Muffett 20 May 1993";
++static const char vers_id[] = "rules.c : v5.0p3 Alec Muffett 20 May 1993";
+ 
+ #include "config.h"
+ #include <string.h>
+@@ -24,7 +24,7 @@
+     int val;
+     char *a, *b, *c, *d, *e, *f, *g;
+ {
+-    fprintf(stderr, a, b, c, d, e, f);
++    fprintf(stderr, a, b, c, d, e, f, g);
+ }
+ #else
+ static void
+@@ -480,7 +480,7 @@
+ 		    Debug(1, "Mangle: '>' weird argument in '%s'\n", control);
+ 		    return ((char *) 0);
+ 		}
+-		if (strlen(area) <= limit)
++		if ( (int) strlen(area) <= limit)
+ 		{
+ 		    return ((char *) 0);
+ 		}
+@@ -499,7 +499,7 @@
+ 		    Debug(1, "Mangle: '<' weird argument in '%s'\n", control);
+ 		    return ((char *) 0);
+ 		}
+-		if (strlen(area) >= limit)
++		if ( (int) strlen(area) >= limit)
+ 		{
+ 		    return ((char *) 0);
+ 		}
+--- a/lib/stringlib.c
++++ b/lib/stringlib.c
+@@ -11,7 +11,7 @@
+ #endif
+ #include "packer.h"
+ 
+-static char vers_id[] = "stringlib.c : v2.3p2 Alec Muffett 18 May 1993";
++static const char vers_id[] = "stringlib.c : v2.3p2 Alec Muffett 18 May 1993";
+ 
+ char
+ Chop(string)
+--- a/util/packer.c
++++ b/util/packer.c
+@@ -17,8 +17,8 @@
+     int argc;
+     char *argv[];
+ {
+-    uint32_t readed;
+-    uint32_t wrote;
++    unsigned long readed;
++    unsigned long wrote;
+     PWDICT *pwp;
+     char buffer[STRINGSIZE];
+     char *file;

Added: cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
===================================================================
--- cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch	                        (rev 0)
+++ cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch	2008-07-10 19:28:42 UTC (rev 27)
@@ -0,0 +1,10 @@
+--- a/util/packer.c
++++ b/util/packer.c
+@@ -57,7 +57,6 @@
+ 
+ 	if (!buffer[0])
+ 	{
+-	    fprintf(stderr, "skipping line: %u\n", readed);
+ 	    continue;
+ 	}
+ 

Added: cracklib2/trunk/debian/patches/series
===================================================================
--- cracklib2/trunk/debian/patches/series	                        (rev 0)
+++ cracklib2/trunk/debian/patches/series	2008-07-10 19:28:42 UTC (rev 27)
@@ -0,0 +1,3 @@
+01-cracklib-format-optim.patch
+02-ccwarnings.patch
+03-packer-dont-print-skipping-line.patch

Modified: cracklib2/trunk/debian/rules
===================================================================
--- cracklib2/trunk/debian/rules	2008-07-01 20:20:27 UTC (rev 26)
+++ cracklib2/trunk/debian/rules	2008-07-10 19:28:42 UTC (rev 27)
@@ -3,6 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -11,7 +12,7 @@
 
 PYVERS := $(shell pyversions -vs)
 
-configure-stamp: configure
+configure-stamp: configure patch
 	dh_testdir
 	mkdir -p debian/tmpbuild
 	cd debian/tmpbuild; \
@@ -35,7 +36,7 @@
 	xmlto -o debian/doc xhtml-nochunks debian/cracklib-runtime.xml
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf build-stamp configure-stamp debian/tmpbuild
@@ -89,20 +90,11 @@
 	dh_builddeb
 
 binary-arch: build install
-	$(MAKE) -f debian/rules binary-libcrack2
-	$(MAKE) -f debian/rules binary-libcrack2-dev
-	$(MAKE) -f debian/rules binary-cracklib-runtime
-	$(MAKE) -f debian/rules binary-python-cracklib DH_OPTIONS=-ppython-cracklib
-
-binary-libcrack2:
 	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-plibcrack2
-
-binary-libcrack2-dev:
 	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-plibcrack2-dev
+	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-pcracklib-runtime
+	$(MAKE) -f debian/rules binary-python-cracklib DH_OPTIONS=-ppython-cracklib
 
-binary-cracklib%:
-	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-pcracklib$*
-
 binary-python%:
 	dh_testdir
 	dh_testroot

More information about the Pkg-cracklib-commits mailing list