Compare commits

...

No commits in common. 'c9' and 'c8' have entirely different histories.
c9 ... c8

@ -1,4 +1,5 @@
9199e7b8830717565a844430653f5a90a04fcd65 SOURCES/cracklib-2.9.6.tar.gz
b0739c990431a0971545dff347b50f922604c1cd SOURCES/cracklib-words-2.9.6.gz
b3b701e951362b23c8abb948936e8534d0c9b9a2 SOURCES/cracklib2_2.8.19-1.debian.tar.gz
d5941a3aa514245922433978a7d07c749d76d000 SOURCES/cracklib2_2.8.19-1.dsc
9b407fa41faaf4138e875f168158e5f4568ea33e SOURCES/missing-words.gz

1
.gitignore vendored

@ -1,4 +1,5 @@
SOURCES/cracklib-2.9.6.tar.gz
SOURCES/cracklib-words-2.9.6.gz
SOURCES/cracklib2_2.8.19-1.debian.tar.gz
SOURCES/cracklib2_2.8.19-1.dsc
SOURCES/missing-words.gz

@ -1,20 +0,0 @@
diff -up cracklib-2.9.6/lib/rules.c.coverity cracklib-2.9.6/lib/rules.c
--- cracklib-2.9.6/lib/rules.c.coverity 2018-10-09 12:15:31.455187555 +0200
+++ cracklib-2.9.6/lib/rules.c 2018-10-10 14:28:43.472740618 +0200
@@ -774,6 +774,8 @@ Mangle(input, control, area) /* returns
}
}
}
+ break;
+
case RULE_MLAST:
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
@@ -809,6 +811,7 @@ Mangle(input, control, area) /* returns
}
}
}
+ break;
default:
Debug(1, "Mangle: unknown command %c in %s\n", *ptr, control);

@ -1,48 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 3.0 (quilt)
Source: cracklib2
Binary: libcrack2, libcrack2-dev, cracklib-runtime, python-cracklib, python3-cracklib
Architecture: any
Version: 2.8.19-1
Maintainer: Jan Dittberner <jandd@debian.org>
Uploaders: Martin Pitt <mpitt@debian.org>
Homepage: http://sourceforge.net/projects/cracklib
Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=pkg-cracklib/pkg-cracklib.git
Vcs-Git: git://git.debian.org/pkg-cracklib/pkg-cracklib.git
Build-Depends: debhelper (>= 7.0.50), 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
Package-List:
cracklib-runtime deb admin optional
libcrack2 deb libs optional
libcrack2-dev deb libdevel extra
python-cracklib deb python optional
python3-cracklib deb python optional
Checksums-Sha1:
29224f51db85e1946c209f6ef6c38da699a9c7cc 611602 cracklib2_2.8.19.orig.tar.gz
b3b701e951362b23c8abb948936e8534d0c9b9a2 29349 cracklib2_2.8.19-1.debian.tar.gz
Checksums-Sha256:
7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9 611602 cracklib2_2.8.19.orig.tar.gz
2f9570faa47bf5ec8bae4bf9d0e6dfacbab6369ab27ff5c28da34396c0dca85c 29349 cracklib2_2.8.19-1.debian.tar.gz
Files:
ca0ec168d9c6466612204e8dfb2df8a9 611602 cracklib2_2.8.19.orig.tar.gz
12936e97cc34a28f2efec62e115a60e1 29349 cracklib2_2.8.19-1.debian.tar.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJPuCxeAAoJEKc+AFVVj7jdf6cP/RyYW8CusiTv7PZGbjOjrorT
/tA7O1UCr+Cpij+PySXh2Nzcq//PBr41wkPftIJRvFd9CPjP5deBCnoSnvPhrZ3b
enRF/xR/42D2M51leoUMcwTpgTXFhjfhUBXwL459zzlnT8X2jHOmRSNTEN9zaBXZ
HiTna67w4sRbtOzemzkTM1HMwHjYCIZO+yK5/gO5klre+jM19zNIqJAu41CsTjmC
mRK2/9Qc6q96VAKwGEVaB14/cEUuMu6rBhgpT5rMcD26EjtXi4QZsfjjx/COhhsC
/MpaKn8re5LVEWyi13onpWgZPwfxkBOtyWyr9iDcSOWRETkLdJJCSL8P2aS+FBUW
ju9Am3Yip1Y7VrlcmAlwmARCofaM/7q1cW4YnFn2vYG7Ogh43P8qu4q889TeXKP7
p+3W2m0CqCMU7FN1PhLs8fSNmvn/Bj+4R2XPU1WSOCbwN78ePpwdzUWQrYWSBAYa
i9GTVUYIILPeGfyTApFwjON2bAK/RrO0WyEjNljSB6QU4h3xrKHIi3eGxJFcnZMH
RFHkNwZInzTAxjz78W3zxfu//GxL+VfxzVZ/QFwclrDr5rDtott767GOoej83RHp
GrUK51OO31hXiP/hEF0pXJpdFkpJ7tvU90W/cwMB3EXqOuqrZ7+woOJFJWNfMpjT
9pqXxvvTYhf4g8Btov9S
=M0t3
-----END PGP SIGNATURE-----

@ -5,7 +5,8 @@
Summary: A password-checking library
Name: cracklib
Version: 2.9.6
Release: 27%{?dist}
Release: 15%{?dist}
Group: System Environment/Libraries
Source0: https://github.com/cracklib/cracklib/releases/download/cracklib-%{version}/cracklib-%{version}.tar.gz
Source1: https://github.com/cracklib/cracklib/releases/download/cracklib-%{version}/cracklib-words-%{version}.gz
@ -25,14 +26,17 @@ Patch4: cracklib-2.9.6-packlib-reentrant.patch
Patch6: cracklib-2.9.6-simplistic.patch
Patch7: cracklib-2.9.6-translation-updates.patch
Patch8: cracklib-2.9.6-cve-2016-6318.patch
Patch9: cracklib-2.9.6-coverity.patch
Patch10: cracklib-2.9.6-lookup.patch
Patch9: cracklib-2.9.6-lookup.patch
URL: http://sourceforge.net/projects/cracklib/
License: LGPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gcc
BuildRequires: words, gettext
BuildRequires: gettext-autopoint
BuildRequires: zlib-devel
%if 0%{?rhel} == 0
BuildRequires: python2-devel
%endif
Conflicts: cracklib-dicts < 2.8
# The cracklib-format script calls gzip, but without a specific path.
Requires: gzip
@ -57,16 +61,33 @@ CrackLib, you will also want to install the cracklib-dicts package.
%package devel
Summary: Development files needed for building applications which use cracklib
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The cracklib-devel package contains the header files and libraries needed
for compiling applications which use cracklib.
%if 0%{?rhel} == 0
%package -n python2-cracklib
Summary: Python bindings for applications which use cracklib
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%{?python_provide:%python_provide python2-cracklib}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
%description -n python2-cracklib
The cracklib-python package contains a module which permits applications
written in the Python programming language to use cracklib.
%endif
%package dicts
Summary: The standard CrackLib dictionaries
Group: System Environment/Libraries
BuildRequires: words >= 2-13
BuildRequires: make
Requires: cracklib = %{version}-%{release}
%description dicts
@ -90,8 +111,7 @@ install -p -m 644 %{SOURCE3} po/zh_CN.po
%patch6 -p1 -b .simplistic
%patch7 -p1 -b .translations
%patch8 -p1 -b .overflow
%patch9 -p1 -b .coverity
%patch10 -p1 -b .lookup
%patch9 -p1 -b .lookup
mkdir cracklib-dicts
for dict in %{SOURCE10} %{SOURCE1}
@ -104,14 +124,18 @@ chmod +x util/cracklib-format
# Use the dictionary from the build to test
sed -i 's,util/cracklib-check <,util/cracklib-check $(DESTDIR)/$(DEFAULT_CRACKLIB_DICT) <,' Makefile.in
%configure --with-pic \
%if 0%{?rhel} == 0
--with-python \
%else
--without-python \
%endif
--with-default-dict=%{dictpath} --disable-static
make -C po update-gmo
make
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%make_install 'pythondir=${pyexecdir}'
make install DESTDIR=$RPM_BUILD_ROOT 'pythondir=${pyexecdir}'
./util/cracklib-format cracklib-dicts/* | \
./util/cracklib-packer $RPM_BUILD_ROOT/%{dictpath}
./util/cracklib-format $RPM_BUILD_ROOT/%{dictdir}/cracklib-small | \
@ -150,6 +174,35 @@ fi
%check
make test DESTDIR=$RPM_BUILD_ROOT
%if 0%{?rhel} == 0
# We want to check that the new library is able to open the new dictionaries,
# using the new python module.
LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} %{__python2} 2>&1 << EOF
import string, sys
# Prepend buildroot-specific variations of the python path to the python path.
syspath2=[]
for element in sys.path:
syspath2.append("$RPM_BUILD_ROOT/" + element)
syspath2.reverse()
for element in syspath2:
sys.path.insert(0,element)
# Now actually do the test. If we get a different result, or throw an
# exception, the script will end with the error.
import cracklib
try:
s = cracklib.FascistCheck("cracklib", "$RPM_BUILD_ROOT/%{dictpath}")
except ValueError, message:
expected = "it is based on a dictionary word"
if message != expected:
print "Got unexpected result \"%s\"," % messgae,
print "instead of expected value of \"%s\"." % expected
sys.exit(1)
print "Got expected result \"%s\"," % message
sys.exit(0)
finally:
sys.exit(0)
EOF
%endif
%ldconfig_scriptlets
@ -175,51 +228,19 @@ make test DESTDIR=$RPM_BUILD_ROOT
%{_sbindir}/mkdict
%{_sbindir}/packer
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.6-27
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.6-26
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 2.9.6-23
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
%if 0%{?rhel} == 0
%files -n python2-cracklib
%{_libdir}/python*/site-packages/_cracklib*.so
%{_libdir}/python*/site-packages/*.py*
%endif
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 9 2019 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-21
- Drop Python 2 bindings completely
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 26 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-18
%changelog
* Mon Nov 26 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-15
- Fix regression in dictionary creation and lookup
* Wed Oct 10 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-17
- Fix minor bug found in the Coverity scan
* Tue Oct 9 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-16
* Tue Oct 9 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-14
- Updated translations
* Fri Jul 13 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-15
- The test must use the dictionary from the build
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 21 2018 Tomáš Mráz <tmraz@redhat.com> - 2.9.6-13
- Drop Python 2 support in RHEL

Loading…
Cancel
Save