rpms/cracklib/devel cracklib-2.8.12-inttypes.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 cracklib.spec, 1.44, 1.45 sources, 1.13, 1.14 cracklib-2.8.9-inttypes.patch, 1.1, NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/cracklib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7822

Modified Files:
	.cvsignore cracklib.spec sources 
Added Files:
	cracklib-2.8.12-inttypes.patch 
Removed Files:
	cracklib-2.8.9-inttypes.patch 
Log Message:
- update to 2.8.12, which relicenses to GPLv2
License note: consumers of this package in the development repository are
pam (pam_cracklib is BSD or GPL), netatalk (GPL), revelation (GPLv2+),
which should all prefer this license to the previous one ("Artistic").


cracklib-2.8.12-inttypes.patch:

--- NEW FILE cracklib-2.8.12-inttypes.patch ---
--- cracklib-2.8.9/configure.in	2006-02-17 14:49:12.000000000 -0500
+++ cracklib-2.8.9/configure.in	2007-03-12 18:47:32.000000000 -0400
@@ -23,6 +23,19 @@
 AC_CHECK_HEADERS(stdint.h)
 AC_CHECK_HEADERS(pthread.h)
 
+if test x$ac_cv_header_inttypes_h = xyes ; then
+	CRACKLIB_INTEGER_TYPES1="#include <inttypes.h>"
+	CRACKLIB_INTEGER_TYPES2=
+elif test x$ac_cv_header_stdint_h = xyes ; then
+	CRACKLIB_INTEGER_TYPES1="#include <stdint.h>"
+	CRACKLIB_INTEGER_TYPES2=
+else
+	CRACKLIB_INTEGER_TYPES1="typedef unsigned int uint32_t;"
+	CRACKLIB_INTEGER_TYPES2="typedef unsigned short uint16_t;"
+fi
+AC_SUBST(CRACKLIB_INTEGER_TYPES1)
+AC_SUBST(CRACKLIB_INTEGER_TYPES2)
+
 dnl Cygwin workaround
 AC_MSG_CHECKING(if LINE_MAX is defined)
 AC_EGREP_CPP(yes,
@@ -87,6 +100,8 @@
 dnl Handle local dict compiling properly
 AC_SUBST(CROSS_COMPILING, $cross_compiling)
 
-AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \
-		po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec)
+AC_CONFIG_FILES(util/Makefile lib/Makefile doc/Makefile python/Makefile \
+		Makefile po/Makefile.in m4/Makefile dicts/Makefile \
+		cracklib.spec lib/packer.h)
+AC_OUTPUT
 
--- cracklib-2.8.9/lib/packer.h.in	2007-03-12 18:47:32.000000000 -0400
+++ cracklib-2.8.9/lib/packer.h.in	2007-03-12 18:49:50.000000000 -0400
@@ -32,17 +32,8 @@
 #define _(String) (String)
 #endif
 
-#if defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#else
-#if defined(HAVE_STDINT_H)
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned short uint16_t;
-#endif
-#endif
-
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
 
 struct pi_header
 {
@@ -84,6 +75,9 @@
 	int dummy;
 } PWDICT;
 
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
+
 #endif
 
 extern PWDICT *PWOpen(const char *prefix, char *mode);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jul 2007 14:06:35 -0000	1.11
+++ .cvsignore	25 Jan 2008 18:50:10 -0000	1.12
@@ -36,3 +36,4 @@
 cracklib-2.8.9.tar.gz
 pass_file.gz
 cracklib-2.8.10.tar.gz
+cracklib-2.8.12.tar.gz


Index: cracklib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cracklib.spec	21 Aug 2007 14:53:37 -0000	1.44
+++ cracklib.spec	25 Jan 2008 18:50:10 -0000	1.45
@@ -3,8 +3,8 @@
 
 Summary: A password-checking library
 Name: cracklib
-Version: 2.8.10
-Release: 3
+Version: 2.8.12
+Release: 1
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 
@@ -43,10 +43,10 @@
 Source37: pass_file.gz
 
 Patch0: cracklib-2.8.10-suffix.patch
-Patch1: cracklib-2.8.9-inttypes.patch
+Patch1: cracklib-2.8.12-inttypes.patch
 Patch2: cracklib-2.8.10-docstring.patch
 URL: http://sourceforge.net/projects/cracklib/
-License: Artistic
+License: GPLv2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-devel, words, automake, libtool
 Conflicts: cracklib-dicts < 2.8
@@ -208,6 +208,9 @@
 %{_libdir}/python*/site-packages/cracklibmodule.so
 
 %changelog
+* Fri Jan 25 2008 Nalin Dahyabhai <nalin at redhat.com> - 2.8.12-1
+- update to 2.8.12, which was relicensed to GPLv2
+
 * Tue Aug 21 2007 Nalin Dahyabhai <nalin at redhat.com> - 2.8.10-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 Jul 2007 14:06:35 -0000	1.13
+++ sources	25 Jan 2008 18:50:10 -0000	1.14
@@ -27,4 +27,4 @@
 c03b38448aefcde059e6fcfb20784f2c  surnames.finnish.gz
 6e76a087a646ede5eba05e9259fd84d4  pass_file.gz
 d18e670e5df560a8745e1b4dede8f84f  cracklib-words.gz
-555f7832b63ebc7fb70b0373500c2358  cracklib-2.8.10.tar.gz
+580346fa1012f9d9769192f49d3801fa  cracklib-2.8.12.tar.gz


--- cracklib-2.8.9-inttypes.patch DELETED ---