rpms/passwd/devel passwd-0.71-audit.patch, 1.1, 1.2 passwd.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/passwd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6418

Modified Files:
	passwd-0.71-audit.patch passwd.spec 
Log Message:
* Tue Jan 31 2006 Steve Grubb <sgrubb at redhat.com> 0.71-3
- Adjust audit patch so it builds without libaudit


passwd-0.71-audit.patch:
 configure.ac |    1 
 passwd.c     |   99 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 55 insertions(+), 45 deletions(-)

Index: passwd-0.71-audit.patch
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd-0.71-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- passwd-0.71-audit.patch	25 Oct 2005 20:09:22 -0000	1.1
+++ passwd-0.71-audit.patch	31 Jan 2006 21:19:53 -0000	1.2
@@ -1,25 +1,40 @@
+diff -ur passwd-0.71.orig/configure.ac passwd-0.71/configure.ac
+--- passwd-0.71.orig/configure.ac	2006-01-31 09:59:08.000000000 -0500
++++ passwd-0.71/configure.ac	2006-01-31 15:40:59.000000000 -0500
+@@ -57,6 +57,7 @@
+ 		if test x$use_selinux != xauto ; then
+ 			AC_MSG_ERROR([requested SELinux, but libselinux was not found])
+ 		fi
++		use_selinux=no
+ 	else
+ 		AC_DEFINE(WITH_SELINUX,1,[Define if you want to use SELinux.])
+ 	fi
 diff -ur passwd-0.71.orig/passwd.c passwd-0.71/passwd.c
---- passwd-0.71.orig/passwd.c	2005-10-25 09:28:23.000000000 -0400
-+++ passwd-0.71/passwd.c	2005-10-25 15:13:19.000000000 -0400
-@@ -48,6 +48,7 @@
+--- passwd-0.71.orig/passwd.c	2006-01-31 10:18:25.000000000 -0500
++++ passwd-0.71/passwd.c	2006-01-31 15:43:52.000000000 -0500
+@@ -48,6 +48,9 @@
  #include <string.h>
  #include <unistd.h>
  #include <popt.h>
 +#include <errno.h>
++#include <limits.h>
++#include <syslog.h>
  #include "pwdb.h"
  
  #ifdef WITH_SELINUX
-@@ -61,7 +62,8 @@
+@@ -60,8 +63,9 @@
+ #ifdef WITH_AUDIT
  #include <libaudit.h>
  #else
- #define audit_open() -1
+-#define audit_open() -1
 -#define audit_log_if_enabled(d,t,f,...) do { ; } while(0) 
-+#define audit_log_user_message(d,t,m,h,a,t,r) do { ; } while(0) 
-+#define audit_log_acct_message(d,t,p,o,n,i,h,a,t,r) do { ; } while(0) 
++#define audit_log_user_message(d,ty,m,h,a,t,r) do { ; } while(0) 
++#define audit_log_acct_message(d,ty,p,o,n,i,h,a,t,r) do { ; } while(0) 
++static int audit_open(void) { errno = EPROTONOSUPPORT; return -1; } 
  #endif
  
  #include <security/pam_appl.h>
-@@ -266,11 +268,13 @@
+@@ -266,11 +270,13 @@
  	    (getuid() != 0)) {
  #endif
  		if (passwd_flags & PASSWD_STATUS) {
@@ -37,7 +52,7 @@
  		}
  		fprintf(stderr, _("Only root can do that.\n"));
  		exit(-2);
-@@ -281,9 +285,9 @@
+@@ -281,9 +287,9 @@
  	if ((extraArgs != NULL) && (extraArgs[0] != NULL)) {
  		if (getuid() != 0) {
  			/* The invoking user was not root. */
@@ -50,7 +65,7 @@
  			fprintf(stderr,
  				_("%s: Only root can specify a user name.\n"),
  				progname);
-@@ -351,6 +355,13 @@
+@@ -351,6 +357,13 @@
  	char *tty_name, *ttyn;
  
  	audit_fd = audit_open();
@@ -64,7 +79,7 @@
  
  	/* Parse command-line arguments. */
  	progname = basename(argv[0]);
-@@ -379,6 +390,9 @@
+@@ -379,6 +392,9 @@
  			  "password of %s\n"),
  			progname, user_context, username);
  		freecon(user_context);
@@ -74,7 +89,7 @@
  		exit(1);
  	}
  #endif
-@@ -390,11 +404,9 @@
+@@ -390,11 +406,9 @@
  		printf("%s: %s\n", progname,
  		       retval ==
  		       0 ? "Success" : "Error (password not set?)");
@@ -89,7 +104,7 @@
  		return retval;
  	}
  	/* Handle account unlocking request. */
-@@ -407,11 +419,9 @@
+@@ -407,11 +421,9 @@
  		       retval ==
  		       -2 ? _("Unsafe operation (use -f to force).") :
  		       _("Error (password not set?)"));
@@ -104,7 +119,7 @@
  		return retval;
  	}
  	/* Handle password clearing request. */
-@@ -420,36 +430,32 @@
+@@ -420,36 +432,32 @@
  		retval = pwdb_clear_password(username);
  		printf("%s: %s\n", progname,
  		       (retval == 0) ? _("Success") : _("Error"));
@@ -154,7 +169,7 @@
  		return retval;
  	}
  
-@@ -519,22 +525,23 @@
+@@ -519,22 +527,23 @@
  		/* We're done.  Tell the invoking user that it worked. */
  		retval = pam_end(pamh, PAM_SUCCESS);
  		if (passwd_flags & PASSWD_KEEP) {


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- passwd.spec	9 Dec 2005 22:42:39 -0000	1.20
+++ passwd.spec	31 Jan 2006 21:19:53 -0000	1.21
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM.
 Name: passwd
 Version: 0.71
-Release: 2.1
+Release: 3
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Tue Jan 31 2006 Steve Grubb <sgrubb at redhat.com> 0.71-3
+- Adjust audit patch so it builds without libaudit
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt