Hello community, here is the log from the commit of package pam_ldap for openSUSE:Factory checked in at 2012-05-16 15:03:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_ldap (Old) and /work/SRC/openSUSE:Factory/.pam_ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_ldap", Maintainer is "rha...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pam_ldap/pam_ldap.changes 2012-03-08 19:44:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pam_ldap.new/pam_ldap.changes 2012-05-16 15:03:28.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 26 20:49:35 UTC 2012 - joop.boo...@opensuse.org + +- created patch pam_ldap-arm-linux-gnueabi.patch to build the + arm binaries correctly +- Update to pam-ldap-186: + * fix for BUG#424: build fails on Darwin + +------------------------------------------------------------------- Old: ---- pam_ldap-185.tar.bz2 New: ---- pam_ldap-186.tar.bz2 pam_ldap-arm-linux-gnueabi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_ldap.spec ++++++ --- /var/tmp/diff_new_pack.vqdDyT/_old 2012-05-16 15:03:30.000000000 +0200 +++ /var/tmp/diff_new_pack.vqdDyT/_new 2012-05-16 15:03:30.000000000 +0200 @@ -16,26 +16,26 @@ # - Name: pam_ldap BuildRequires: automake BuildRequires: openldap2-devel BuildRequires: pam-devel -License: LGPL-2.1+ -Group: Productivity/Networking/LDAP/Clients # bug437293 %ifarch ppc64 Obsoletes: pam_ldap-64bit %endif # -Version: 185 +Version: 186 Release: 0 Summary: A PAM Module for LDAP Authentication +License: LGPL-2.1+ +Group: Productivity/Networking/LDAP/Clients Url: http://www.padl.com/OSS/pam_ldap.html Source: pam_ldap-%{version}.tar.bz2 Source1: README.SuSE Source2: baselibs.conf Patch: pam_ldap.patch +Patch1: pam_ldap-arm-linux-gnueabi.patch Patch2: pam_ldap-expirewarning.dif Patch3: pam_ldap-chauthtok-errcode.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,6 +51,7 @@ %prep %setup %patch -E +%patch1 -p1 %patch2 -p1 %patch3 -p1 cp -v %{S:1} . ++++++ pam_ldap-185.tar.bz2 -> pam_ldap-186.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/CVSVersionInfo.txt new/pam_ldap-186/CVSVersionInfo.txt --- old/pam_ldap-185/CVSVersionInfo.txt 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/CVSVersionInfo.txt 2010-11-08 01:58:44.000000000 +0100 @@ -1,8 +1,8 @@ # Created and modified by checkpoint; do not edit -# $Id: CVSVersionInfo.txt,v 1.205 2009/11/06 10:29:26 lukeh Exp $ -# $Name: pam_ldap-185 $ +# $Id: CVSVersionInfo.txt,v 1.206 2010/11/08 00:58:42 lukeh Exp $ +# $Name: pam_ldap-186 $ ProjectName: pam_ldap -ProjectVersion: 185 +ProjectVersion: 186 ProjectMaintainer: lukeh # run this before building in RC. @@@PLATFORM@@@ is # substituted for our platform names (linux, solaris etc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/ChangeLog new/pam_ldap-186/ChangeLog --- old/pam_ldap-185/ChangeLog 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/ChangeLog 2010-11-08 01:58:44.000000000 +0100 @@ -1,6 +1,10 @@ -$Id: ChangeLog,v 1.216 2009/05/18 23:04:50 lukeh Exp $ +$Id: ChangeLog,v 1.217 2010/11/08 00:55:08 lukeh Exp $ =============================================================== +186 Luke Howard <lukeh@padlcom> + + * fix for BUG#424: build fails on Darwin + 185 Luke Howard <lukeh@padlcom> * fix for BUG#232: LDAP write on userPassword fails diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/Makefile.am new/pam_ldap-186/Makefile.am --- old/pam_ldap-185/Makefile.am 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/Makefile.am 2010-11-08 01:58:44.000000000 +0100 @@ -44,4 +44,4 @@ @$(NORMAL_UNINSTALL) vers.c: $(top_srcdir)/CVSVersionInfo.txt - CVSVERSIONDIR=$(top_srcdir) vers_string -v + $(top_srcdir)/vers_string -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/Makefile.in new/pam_ldap-186/Makefile.in --- old/pam_ldap-185/Makefile.in 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/Makefile.in 2010-11-08 01:58:44.000000000 +0100 @@ -611,7 +611,7 @@ @$(NORMAL_UNINSTALL) vers.c: $(top_srcdir)/CVSVersionInfo.txt - CVSVERSIONDIR=$(top_srcdir) vers_string -v + $(top_srcdir)/vers_string -v # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/pam_ldap.c new/pam_ldap-186/pam_ldap.c --- old/pam_ldap-185/pam_ldap.c 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/pam_ldap.c 2010-11-08 01:58:44.000000000 +0100 @@ -131,7 +131,7 @@ #include "pam_ldap.h" #include "md5.h" -#if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H) +#if defined(HAVE_SECURITY_PAM_MISC_H) || defined(HAVE_PAM_PAM_MISC_H) || defined(OPENPAM) /* FIXME: is there something better to check? */ #define CONST_ARG const #else @@ -149,7 +149,7 @@ #endif static char rcsid[] __UNUSED__ = - "$Id: pam_ldap.c,v 1.213 2009/05/18 23:04:50 lukeh Exp $"; + "$Id: pam_ldap.c,v 1.215 2010/11/08 00:58:36 lukeh Exp $"; #if LDAP_SET_REBIND_PROC_ARGS < 3 static pam_ldap_session_t *global_session = 0; #endif @@ -1948,13 +1948,13 @@ if (interact->challenge != NULL) { challenge_msg.msg_style = PAM_TEXT_INFO; - challenge_msg.msg = interact->challenge; + challenge_msg.msg = (char *)interact->challenge; pmsg[i++] = &challenge_msg; } prompt_msg.msg_style = (interact->id == SASL_CB_ECHOPROMPT) ? PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; - prompt_msg.msg = (interact->prompt != NULL) ? interact->prompt : "Enter SASL response: "; + prompt_msg.msg = (interact->prompt != NULL) ? (char *)interact->prompt : "Enter SASL response: "; pmsg[i++] = &prompt_msg; rc = pam_get_item(pamh, PAM_CONV, (CONST_ARG void **)&conv); @@ -3707,11 +3707,7 @@ { _conv_sendmsg (appconv, "Password change aborted", PAM_ERROR_MSG, no_warn); -#ifdef PAM_AUTHTOK_RECOVERY_ERR return PAM_AUTHTOK_RECOVERY_ERR; -#else - return PAM_AUTHTOK_RECOVER_ERR; -#endif /* PAM_AUTHTOK_RECOVERY_ERR */ } else { @@ -3753,11 +3749,7 @@ syslog (LOG_ERR, "pam_ldap: error getting old authentication token (%s)", pam_strerror (pamh, rc)); -#ifdef PAM_AUTHTOK_RECOVERY_ERR return PAM_AUTHTOK_RECOVERY_ERR; -#else - return PAM_AUTHTOK_RECOVER_ERR; -#endif /* PAM_AUTHTOK_RECOVERY_ERR */ } if (try_first_pass || use_first_pass) @@ -3767,11 +3759,7 @@ newpass = NULL; if (use_first_pass && newpass == NULL) -#ifdef PAM_AUTHTOK_RECOVERY_ERR return PAM_AUTHTOK_RECOVERY_ERR; -#else - return PAM_AUTHTOK_RECOVER_ERR; -#endif /* PAM_AUTHTOK_RECOVERY_ERR */ } tries = 0; @@ -3821,11 +3809,7 @@ } else { -#ifdef PAM_AUTHTOK_RECOVERY_ERR return PAM_AUTHTOK_RECOVERY_ERR; -#else - return PAM_AUTHTOK_RECOVER_ERR; -#endif /* PAM_AUTHTOK_RECOVERY_ERR */ } if (cmiscptr == NULL) @@ -3857,11 +3841,7 @@ { _conv_sendmsg (appconv, "Password change aborted", PAM_ERROR_MSG, no_warn); -#ifdef PAM_AUTHTOK_RECOVERY_ERR return PAM_AUTHTOK_RECOVERY_ERR; -#else - return PAM_AUTHTOK_RECOVER_ERR; -#endif /* PAM_AUTHTOK_RECOVERY_ERR */ } } else if (!strcmp (newpass, miscptr)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/pam_ldap.h new/pam_ldap-186/pam_ldap.h --- old/pam_ldap-185/pam_ldap.h 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/pam_ldap.h 2010-11-08 01:58:44.000000000 +0100 @@ -175,7 +175,7 @@ inactive. */ long int expire; /* Number of days since 1970-01-01 until account expires. */ - unsigned long int flag; /* Reserved. */ + long int flag; /* Reserved. */ } pam_ldap_shadow_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_ldap-185/vers_string new/pam_ldap-186/vers_string --- old/pam_ldap-185/vers_string 2009-11-06 11:29:34.000000000 +0100 +++ new/pam_ldap-186/vers_string 2010-11-08 01:58:44.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -#ident $Id: vers_string,v 1.1 2009/11/06 10:27:49 lukeh Exp $ +#ident $Id: vers_string,v 1.2 2010/02/25 14:40:39 lukeh Exp $ # # Implementation of SGS vers_string which uses CVSVersionInfo.txt. @@ -8,7 +8,7 @@ $OUTFILE = (-f "version.h") ? "version.h" : "vers.c"; $AUTHOR = `whoami`; -$HEADER = '$Id: vers_string,v 1.1 2009/11/06 10:27:49 lukeh Exp $'; +$HEADER = '$Id: vers_string,v 1.2 2010/02/25 14:40:39 lukeh Exp $'; if ($ENV{'PROGRAM'}) { $PROGRAM = $ENV{'PROGRAM'}; } @@ -58,7 +58,7 @@ close(OUTFILE); } elsif ($ARGV[0] ne "") { print STDERR "$HEADER\n"; - print STDERR "Copyright (C) 1997-1998 Luke Howard <lukeh\@gday.net.au>"; + print STDERR "Copyright (C) 1997-2010 Luke Howard <lukeh\@padl.com>"; print STDERR "\n\n"; print STDERR "Unknown command line option $ARGV[0].\n"; print STDERR "Usage: vers_string [-f|-l|-c|-n|-B|-v]\n"; ++++++ pam_ldap-arm-linux-gnueabi.patch ++++++ diff -Naur pam_ldap-185.orig/configure pam_ldap-185/configure --- pam_ldap-185.orig/configure 2009-11-06 11:29:34.000000000 +0100 +++ pam_ldap-185/configure 2012-04-26 22:47:29.000000000 +0200 @@ -3339,7 +3339,7 @@ -if test "$target_os" = "linux" -o "$target_os" = "linux-gnu"; then +if test "$target_os" = "linux" -o "$target_os" = "linux-gnu" -o "$target_os" = "linux-gnueabi"; then EXTENSION_SO_TRUE= EXTENSION_SO_FALSE='#' else diff -Naur pam_ldap-185.orig/configure.in pam_ldap-185/configure.in --- pam_ldap-185.orig/configure.in 2009-11-06 11:29:34.000000000 +0100 +++ pam_ldap-185/configure.in 2012-04-26 23:25:25.000000000 +0200 @@ -48,7 +48,7 @@ AC_SUBST(pam_ldap_so_LDFLAGS) AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$pam_ldap_so_LD") -AM_CONDITIONAL(EXTENSION_SO, test "$target_os" = "linux" -o "$target_os" = "linux-gnu") +AM_CONDITIONAL(EXTENSION_SO, test "$target_os" = "linux" -o "$target_os" = "linux-gnu" -o "$target_os" = "linux-gnueabi") AM_CONDITIONAL(EXTENSION_1, test "$TARGET_OS" = "HPUX") if test -n "$with_ldap_dir"; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
