[Pkg-cracklib-commits] r105 - in cracklib2/trunk/debian: . patches
Jan Dittberner
jandd at alioth.debian.org
Wed Nov 18 17:21:32 UTC 2009
Author: jandd
Date: 2009-11-18 17:21:32 +0000 (Wed, 18 Nov 2009)
New Revision: 105
Removed:
cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
cracklib2/trunk/debian/patches/02-ccwarnings.patch
cracklib2/trunk/debian/patches/04-enable-gettext.patch
Modified:
cracklib2/trunk/debian/changelog
cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
cracklib2/trunk/debian/patches/series
Log:
prepare for 2.8.14 changes
Modified: cracklib2/trunk/debian/changelog
===================================================================
--- cracklib2/trunk/debian/changelog 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/changelog 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,10 +1,16 @@
-cracklib2 (2.8.13-14) UNRELEASED; urgency=low
+cracklib2 (2.8.14-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- * debian/patches/01-cracklib-format-optim.patch,
- patches/02-ccwarnings.patch,
- patches/03-packer-dont-print-skipping-line.patch,
- patches/04-enable-gettext.patch annotated with DEP-3 tags
+ * New upstream release
+ - integrate Debian patches
+ - added and updated translations
+ - improved Python binding
+ * remove patches debian/patches/01-cracklib-format-optim.patch,
+ debian/patches/02-ccwarnings.patch and
+ debian/patches/04-enable-gettext.patch that have been applied
+ upstream, update debian/patches/series accordingly
+ * patches/03-packer-dont-print-skipping-line.patch annotated with DEP-3
+ tags
-- Jan Dittberner <jandd at debian.org> Sat, 14 Nov 2009 23:13:15 +0100
Deleted: cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
===================================================================
--- cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,16 +0,0 @@
-Author: Martin Pitt <mpitt at debian.org>
-Subject: optimize normalization in cracklib-format
---- 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
Deleted: cracklib2/trunk/debian/patches/02-ccwarnings.patch
===================================================================
--- cracklib2/trunk/debian/patches/02-ccwarnings.patch 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/patches/02-ccwarnings.patch 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,75 +0,0 @@
-Author: Martin Pitt <mpitt at debian.org>
-Subject: fixes for cc warnings
---- a/lib/packlib.c
-+++ b/lib/packlib.c
-@@ -15,7 +15,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;
Modified: cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
===================================================================
--- cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,5 +1,7 @@
Author: Martin Pitt <mpitt at debian.org>
Subject: remove unnecessary output of skipped lines
+Bug-Debian: http://bugs.debian.org/304583
+Last-Update: 2009-11-18
--- a/util/packer.c
+++ b/util/packer.c
@@ -57,7 +57,6 @@
Deleted: cracklib2/trunk/debian/patches/04-enable-gettext.patch
===================================================================
--- cracklib2/trunk/debian/patches/04-enable-gettext.patch 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/patches/04-enable-gettext.patch 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,15 +0,0 @@
-Author: Marc Dequènes <mdequenes at proformatique.com>
-Subject: enable gettext support
-Bug: 503826
---- a/util/check.c
-+++ b/util/check.c
-@@ -20,6 +20,9 @@
- const char *why;
- int i;
-
-+ setlocale(LC_ALL, "");
-+ textdomain(PACKAGE);
-+
- while (fgets(buf, sizeof(buf), stdin) != NULL) {
- while (((i = strlen(buf)) > 0) && (i > 0)) {
- if (strchr("\r\n", buf[i - 1]) != NULL) {
Modified: cracklib2/trunk/debian/patches/series
===================================================================
--- cracklib2/trunk/debian/patches/series 2009-11-18 16:46:10 UTC (rev 104)
+++ cracklib2/trunk/debian/patches/series 2009-11-18 17:21:32 UTC (rev 105)
@@ -1,4 +1 @@
-01-cracklib-format-optim.patch
-02-ccwarnings.patch
03-packer-dont-print-skipping-line.patch
-04-enable-gettext.patch
More information about the Pkg-cracklib-commits
mailing list