--- Begin Message ---
Package: cracklib2
Version: 2.8.19-1
Severity: wishlist
User: [email protected]
Usertags: origin-ubuntu quantal ubuntu-patch
Tags: patch
Hi there,
I just uploaded libpwquality which depends on libcrack2. I'd like to
make it multiarch, so it'd be good if cracklib2 could be made so too.
I'm attaching a patch series (against git) for your consideration. Some
notes:
- To be conservative, I only multiarched the shared lib and the
support package, not the -dev or anything else. You might want to do
that.
- I noticed that xmlto didn't generate the same output on i386 and
amd64, which broke the multiarch conversion since all files need to
have the same contents. Fortunatly docbook2html seems to, and works
fine for your documentation, so I converted that.
I gave the python library a quick go, and tested that pam_cracklib still
works.
Please consider reviewing and applying. :-)
Cheers,
--
Iain Lane [ [email protected] ]
Debian Developer [ [email protected] ]
Ubuntu Developer [ [email protected] ]
PhD student [ [email protected] ]
From 3a4178af7e906137bee59d6a51f0edfcce8b6990 Mon Sep 17 00:00:00 2001
From: Iain Lane <[email protected]>
Date: Mon, 2 Jul 2012 13:01:50 +0100
Subject: [PATCH 1/3] Update for multiarch.
---
debian/changelog | 6 ++++++
debian/control | 6 +++++-
debian/libcrack2-dev.links | 1 -
debian/rules | 18 +++++++++++++-----
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63beeb7..c4993c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cracklib2 (2.8.19-2) UNRELEASED; urgency=low
+
+ * Update for multiarch.
+
+ -- Iain Lane <[email protected]> Mon, 02 Jul 2012 12:45:00 +0100
+
cracklib2 (2.8.19-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control b/debian/control
index 741ad83..b1df4a2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Jan Dittberner <[email protected]>
Uploaders: Martin Pitt <[email protected]>
Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~),
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~),
python3-all-dev (>= 3.1.3-2~), chrpath, xmlto, automake (>= 1.10),
autoconf (>=2.61), libtool, python-setuptools, python3-setuptools,
dpkg-dev (>= 1.16.1~), autotools-dev
@@ -14,6 +14,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cracklib/pkg-cracklib.git
Package: libcrack2
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: cracklib-runtime
Description: pro-active password checker library
@@ -40,6 +42,8 @@ Description: pro-active password checker library - development files
Package: cracklib-runtime
Section: admin
Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, libcrack2 (>=${binary:Version}), file,
${misc:Depends}
Recommends: wamerican | wordlist
diff --git a/debian/libcrack2-dev.links b/debian/libcrack2-dev.links
index 2bde974..4b01ff6 100644
--- a/debian/libcrack2-dev.links
+++ b/debian/libcrack2-dev.links
@@ -1,2 +1 @@
-/usr/lib/libcrack.so.2 /usr/lib/libcrack.so
/usr/share/man/man3/FascistCheck.3 /usr/share/man/man3/cracklib.3
diff --git a/debian/rules b/debian/rules
index f3abdd9..36b2940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ include /usr/share/python/python.mk
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
PYVERS := $(shell pyversions -vs)
PY3VERS := $(shell py3versions -vs)
@@ -19,6 +20,7 @@ override_dh_auto_configure:
$(CURDIR)/configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --disable-rpath --without-python \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-default-dict=/var/cache/cracklib/cracklib_dict \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
for i in $(PYVERS) $(PY3VERS); do \
@@ -27,6 +29,7 @@ override_dh_auto_configure:
$(CURDIR)/configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --disable-rpath \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-default-dict=/var/cache/cracklib/cracklib_dict \
PYTHON_PREFIX=$(call py_builddir_sh,$$i) \
PYTHON=/usr/bin/python$$i \
@@ -75,11 +78,11 @@ override_dh_auto_clean:
override_dh_auto_install:
$(MAKE) -C $(CURDIR)/debian/buildtmp/base DESTDIR=$(CURDIR)/debian/libcrack2 install
# move files to libcrack2-dev
- mkdir -p $(CURDIR)/debian/libcrack2-dev/usr/lib
+ mkdir -p $(CURDIR)/debian/libcrack2-dev/usr/lib/$(DEB_HOST_MULTIARCH)
mv $(CURDIR)/debian/libcrack2/usr/include \
$(CURDIR)/debian/libcrack2-dev/usr
- mv $(CURDIR)/debian/libcrack2/usr/lib/*.a \
- $(CURDIR)/debian/libcrack2-dev/usr/lib
+ mv $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \
+ $(CURDIR)/debian/libcrack2-dev/usr/lib/$(DEB_HOST_MULTIARCH)
# move files to cracklib-runtime
mkdir -p $(CURDIR)/debian/cracklib-runtime/usr/share/dict
mv $(CURDIR)/debian/libcrack2/usr/sbin \
@@ -87,8 +90,8 @@ override_dh_auto_install:
mv $(CURDIR)/debian/libcrack2/usr/share/cracklib/cracklib-small \
$(CURDIR)/debian/cracklib-runtime/usr/share/dict
# remove unused files
- rm -f $(CURDIR)/debian/libcrack2/usr/lib/*.la \
- $(CURDIR)/debian/libcrack2/usr/lib/libcrack.so
+ rm -f $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
+ $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so
rm -rf $(CURDIR)/debian/libcrack2/usr/share/cracklib
chrpath -d \
$(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-check \
@@ -103,6 +106,11 @@ override_dh_auto_install:
python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-cracklib; \
done
+override_dh_link:
+ dh_link -plibcrack2-dev usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so.2 \
+ usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so
+ dh_link
+
override_dh_installchangelogs:
dh_installchangelogs NEWS
--
1.7.10.4
From a90a62811e56b847326deb9f4691eb18997812f8 Mon Sep 17 00:00:00 2001
From: Iain Lane <[email protected]>
Date: Mon, 2 Jul 2012 13:57:57 +0100
Subject: [PATCH 2/3] Use docbook2html instead of xmlto, for determinstic
output.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4993c2..a726b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
cracklib2 (2.8.19-2) UNRELEASED; urgency=low
* Update for multiarch.
+ * Use docbook2html instead of xmlto, for determinstic output.
-- Iain Lane <[email protected]> Mon, 02 Jul 2012 12:45:00 +0100
diff --git a/debian/control b/debian/control
index b1df4a2..2dbdc72 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jan Dittberner <[email protected]>
Uploaders: Martin Pitt <[email protected]>
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~),
- python3-all-dev (>= 3.1.3-2~), chrpath, xmlto, automake (>= 1.10),
+ python3-all-dev (>= 3.1.3-2~), chrpath, docbook-utils, automake (>= 1.10),
autoconf (>=2.61), libtool, python-setuptools, python3-setuptools,
dpkg-dev (>= 1.16.1~), autotools-dev
Homepage: http://sourceforge.net/projects/cracklib
diff --git a/debian/rules b/debian/rules
index 36b2940..646d47d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,8 +49,8 @@ override_dh_auto_build:
. ; \
CFLAGS="-I$(CURDIR)/lib $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" python$$i setup.py build ; \
done
- xmlto -o debian/doc xhtml-nochunks debian/libcrack2.xml
- xmlto -o debian/doc xhtml-nochunks debian/cracklib-runtime.xml
+ docbook2html -o debian/doc --nochunks debian/libcrack2.xml
+ docbook2html -o debian/doc --nochunks debian/cracklib-runtime.xml
override_dh_auto_test:
mkdir $(CURDIR)/debian/tmp
--
1.7.10.4
From d321662f94843a851ae3c4c39a9665e340179305 Mon Sep 17 00:00:00 2001
From: Iain Lane <[email protected]>
Date: Mon, 2 Jul 2012 14:07:48 +0100
Subject: [PATCH 3/3] Fix non-SGML characters in cracklib-runtime.xml
---
debian/changelog | 1 +
debian/cracklib-runtime.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a726b40..a345096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cracklib2 (2.8.19-2) UNRELEASED; urgency=low
* Update for multiarch.
* Use docbook2html instead of xmlto, for determinstic output.
+ * Fix non-SGML characters in cracklib-runtime.xml
-- Iain Lane <[email protected]> Mon, 02 Jul 2012 12:45:00 +0100
diff --git a/debian/cracklib-runtime.xml b/debian/cracklib-runtime.xml
index b65d1bc..a8cd5b7 100644
--- a/debian/cracklib-runtime.xml
+++ b/debian/cracklib-runtime.xml
@@ -75,7 +75,7 @@
<title>cracklib-format</title>
<para><application>cracklib-format</application> takes a list
of text files each containing a list of words, one per line,
- It lowercases all words, removes control charac‐ters, and
+ It lowercases all words, removes control characters, and
sorts the lists. It outputs the cleaned up list to standard
output.
</para>
@@ -119,7 +119,7 @@
<title><package>cracklib2</package>'s test utility
<application>cracklib-check.</application></title>
<para><application>cracklib-check</application> takes a list of
- passwords from stdin and checks them via libcrack2’s <ulink
+ passwords from stdin and checks them via libcrack2's <ulink
url="/cgi-bin/man/man2html/FascistCheck+3">FascistCheck</ulink>
sub routine.</para>
<para><application>cracklib-check</application> prints each
--
1.7.10.4
signature.asc
Description: Digital signature
--- End Message ---
