Control: tags 936339 + patch
Control: tags 936339 + pending
Dear maintainer,
I've prepared an NMU for cracklib2 (versioned as 2.9.6-2.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru cracklib2-2.9.6/debian/changelog cracklib2-2.9.6/debian/changelog
--- cracklib2-2.9.6/debian/changelog 2018-12-31 06:04:32.000000000 -0500
+++ cracklib2-2.9.6/debian/changelog 2019-10-18 22:08:11.000000000 -0400
@@ -1,3 +1,10 @@
+cracklib2 (2.9.6-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #936339
+
+ -- Sandro Tosi <mo...@debian.org> Fri, 18 Oct 2019 22:08:11 -0400
+
cracklib2 (2.9.6-2) unstable; urgency=medium
* Add missing 2.9.6-1 changelog bug tracker references
diff -Nru cracklib2-2.9.6/debian/control cracklib2-2.9.6/debian/control
--- cracklib2-2.9.6/debian/control 2018-12-31 06:04:32.000000000 -0500
+++ cracklib2-2.9.6/debian/control 2019-10-18 22:05:48.000000000 -0400
@@ -13,10 +13,7 @@
docbook-xml,
dpkg-dev (>= 1.16.1~),
libtool,
- libpython-all-dev (>= 2.6.6-3~) <!nopython>,
libpython3-all-dev (>= 3.1.3-2~) <!nopython>,
- python-all-dev:any (>= 2.6.6-3~) <!nopython>,
- python-setuptools <!nopython>,
python3-all-dev:any (>= 3.1.3-2~) <!nopython>,
python3-setuptools <!nopython>
Homepage: https://github.com/cracklib/cracklib
@@ -62,7 +59,7 @@
.
If you want to build software using cracklib2 you will need to
install this package. For developing Python based applications for
- cracklib2 you need to install python-cracklib instead.
+ cracklib2 you need to install python3-cracklib instead.
Package: cracklib-runtime
Section: admin
@@ -79,26 +76,6 @@
including programs to build the password dictionary databases used by
the functions in the shared library.
-Package: python-cracklib
-Section: python
-Architecture: any
-Depends: cracklib-runtime
- (>=${binary:Version}),
- libcrack2 (>=${binary:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Provides: ${python:Provides}
-Conflicts: python-crack
-Build-Profiles: <!nopython>
-Description: Python bindings for password checker library cracklib2
- This package provides Python bindings for cracklib. It contains a
- pythonic interface to cracklib's functions and some Python
- convenience functions.
- .
- You should install this package if you want to use or develop Python
- applications that want to interface with cracklib2.
-
Package: python3-cracklib
Section: python
Architecture: any
diff -Nru cracklib2-2.9.6/debian/python-cracklib.preinst cracklib2-2.9.6/debian/python-cracklib.preinst
--- cracklib2-2.9.6/debian/python-cracklib.preinst 2018-12-31 06:04:32.000000000 -0500
+++ cracklib2-2.9.6/debian/python-cracklib.preinst 1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
- if dpkg --compare-versions "$2" lt 2.8.13-13; then
- pycentral pkgremove python-cracklib
- fi
-fi
-
-#DEBHELPER#
diff -Nru cracklib2-2.9.6/debian/rules cracklib2-2.9.6/debian/rules
--- cracklib2-2.9.6/debian/rules 2018-12-31 06:04:32.000000000 -0500
+++ cracklib2-2.9.6/debian/rules 2019-10-18 22:07:58.000000000 -0400
@@ -10,16 +10,13 @@
include /usr/share/dpkg/architecture.mk
ifeq ($(filter stage1,$(DEB_STAGE))$(filter nopython,$(DEB_BUILD_PROFILES)),)
-PYVERS := $(shell pyversions -vs)
PY3VERS := $(shell py3versions -vs)
-DH_WITH_PARAMETERS := python2,python3
-# python2.7
-export PYTHONPATH:=/usr/lib/python2.7/plat-$(DEB_HOST_MULTIARCH)$(if $(PYTHONPATH),:$(PYTHONPATH))
+DH_WITH_PARAMETERS := python3
# python3.X, see pybuild for their meaning.
export _PYTHON_HOST_PLATFORM:=$(DEB_HOST_ARCH_OS)-$(DEB_HOST_ARCH)
export _PYTHON_SYSCONFIGDATA_NAME:=_sysconfigdata_m_$(DEB_HOST_ARCH_OS)_$(DEB_HOST_MULTIARCH)
else
-NOPYTHON_OPTIONS = -Npython-cracklib -Npython3-cracklib
+NOPYTHON_OPTIONS = -Npython3-cracklib
DH_WITH_PARAMETERS :=
endif
@@ -39,7 +36,7 @@
--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 \
+ for i in $(PY3VERS); do \
mkdir -p $(CURDIR)/debian/buildtmp/python$$i; \
cd $(CURDIR)/debian/buildtmp/python$$i; \
$(CURDIR)/configure \
@@ -56,7 +53,7 @@
$(MAKE) -C $(CURDIR)/debian/buildtmp/base
ifeq ($(filter stage1,$(DEB_STAGE))$(filter nopython,$(DEB_BUILD_PROFILES)),)
ln -s $(CURDIR)/debian/crack.py $(CURDIR)/python; \
- for i in $(PYVERS) $(PY3VERS); do \
+ for i in $(PY3VERS); do \
cd $(CURDIR)/debian/buildtmp/python$$i; \
rm -rf lib; ln -s $(CURDIR)/debian/buildtmp/base/lib lib; \
cd python; \
@@ -72,7 +69,7 @@
ifeq ($(filter stage1,$(DEB_STAGE))$(filter nopython,$(DEB_BUILD_PROFILES))$(filter nocheck,$(DEB_BUILD_OPTIONS)),)
$(CRACKLIB_PACKER) $(CURDIR)/debian/tmp/cracklib_dict < \
$(CURDIR)/dicts/cracklib-small
- for i in $(PYVERS) $(PY3VERS); do \
+ for i in $(PY3VERS); do \
cd $(CURDIR)/debian/buildtmp/python$$i/python/$(call py_builddir_sh,$$i); \
LD_LIBRARY_PATH=$(CURDIR)/debian/buildtmp/base/lib/.libs python$$i \
-c 'import cracklib; cracklib.test(dictpath="$(CURDIR)/debian/tmp/cracklib_dict")'; \
@@ -129,10 +126,6 @@
$(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-unpacker
ifeq ($(filter stage1,$(DEB_STAGE))$(filter nopython,$(DEB_BUILD_PROFILES)),)
- for i in $(PYVERS); do \
- cd $(CURDIR)/debian/buildtmp/python$$i/python; \
- python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python-cracklib; \
- done
for i in $(PY3VERS); do \
cd $(CURDIR)/debian/buildtmp/python$$i/python; \
python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-cracklib; \
@@ -148,9 +141,6 @@
dh_installchangelogs NEWS
ifeq ($(filter stage1,$(DEB_STAGE))$(filter nopython,$(DEB_BUILD_PROFILES)),)
-override_dh_python2:
- dh_python2 -ppython-cracklib
-
override_dh_python3:
dh_python3 -ppython3-cracklib
endif
