rpms/sudo/F-11 sudo-1.7.1-conffix.patch, NONE, 1.1 sudo-1.7.1-audit.patch, 1.1, 1.2 sudo.spec, 1.76, 1.77

[Daniel Kopeček]

Author: mildew

Update of /cvs/pkgs/rpms/sudo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30368

Modified Files:
	sudo-1.7.1-audit.patch sudo.spec 
Added Files:
	sudo-1.7.1-conffix.patch 
Log Message:
- fixed small bug in configure.in (sudo-1.7.1-conffix.patch)
- sudo-1.7.1-audit.patch rediff because of missing code


sudo-1.7.1-conffix.patch:

--- NEW FILE sudo-1.7.1-conffix.patch ---
diff -up sudo-1.7.1/configure.in.conffix sudo-1.7.1/configure.in
--- sudo-1.7.1/configure.in.conffix	2009-06-22 15:45:51.000000000 +0200
+++ sudo-1.7.1/configure.in	2009-06-22 15:45:30.000000000 +0200
@@ -2473,7 +2473,7 @@ if test ${with_ldap-'no'} != "no"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_LBER_H)])
 
-    AC_CHECK_HEADERS([sasl/sasl.h] [sasl.h], [AC_CHECK_FUNCS(ldap_sasl_interactive_bind_s), [break]])
+    AC_CHECK_HEADERS([sasl/sasl.h] [sasl.h], [AC_CHECK_FUNCS(ldap_sasl_interactive_bind_s)], [break])
     AC_CHECK_HEADERS([ldap_ssl.h] [mps/ldap_ssl.h], [break], [], [#include <ldap.h>])
     AC_CHECK_FUNCS(ldap_initialize ldap_start_tls_s ldapssl_init ldapssl_set_strength ldap_search_ext_s ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s ldap_ssl_client_init ldap_start_tls_s_np)
 

sudo-1.7.1-audit.patch:

Index: sudo-1.7.1-audit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-11/sudo-1.7.1-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sudo-1.7.1-audit.patch	12 May 2009 11:54:27 -0000	1.1
+++ sudo-1.7.1-audit.patch	22 Jun 2009 14:31:47 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up sudo-1.7.1/audit_help.c.audit sudo-1.7.1/audit_help.c
---- sudo-1.7.1/audit_help.c.audit	2009-05-02 22:40:31.000000000 +0200
-+++ sudo-1.7.1/audit_help.c	2009-05-02 22:40:03.000000000 +0200
+diff -up /dev/null sudo-1.7.1/audit_help.c
+--- /dev/null	2009-06-19 12:23:43.376002420 +0200
++++ sudo-1.7.1/audit_help.c	2009-06-22 14:24:48.000000000 +0200
 @@ -0,0 +1,136 @@
 +/*
 + *  Audit helper functions used throughout sudo
@@ -139,8 +139,8 @@ diff -up sudo-1.7.1/audit_help.c.audit s
 +#endif
 +#endif                         /* WITH_AUDIT */
 diff -up sudo-1.7.1/configure.in.audit sudo-1.7.1/configure.in
---- sudo-1.7.1/configure.in.audit	2009-05-02 22:43:31.000000000 +0200
-+++ sudo-1.7.1/configure.in	2009-05-02 22:03:15.000000000 +0200
+--- sudo-1.7.1/configure.in.audit	2009-06-22 14:24:48.000000000 +0200
++++ sudo-1.7.1/configure.in	2009-06-22 14:26:42.000000000 +0200
 @@ -179,6 +179,10 @@ dnl
  dnl Options for --with
  dnl
@@ -152,9 +152,34 @@ diff -up sudo-1.7.1/configure.in.audit s
  AC_ARG_WITH(CC, [  --with-CC               C compiler to use],
  [case $with_CC in
      yes)	AC_MSG_ERROR(["must give --with-CC an argument."])
+@@ -1706,6 +1710,24 @@ dnl
+ : ${mansectsu='8'}
+ : ${mansectform='5'}
+ 
++AC_SUBST(LIBAUDIT)
++if test "$with_audit" = "yes"; then
++	# See if we have the audit library
++        AC_CHECK_HEADER(libaudit.h, [audit_header="yes"], [audit_header="no"])
++        if test "$audit_header" = "yes"; then
++                AC_CHECK_LIB(audit, audit_log_user_command,
++                        [AC_DEFINE(WITH_AUDIT, 1, [Define if you want to enable Audit messages])
++                        LIBAUDIT="-laudit"])
++        fi
++	# See if we have the libcap library
++	AC_CHECK_HEADERS(sys/capability.h sys/prctl.h, [cap_header="yes"], [cap_header="no"])
++	if test "$cap_header" = "yes"; then
++		AC_CHECK_LIB(cap, cap_init,
++			[AC_DEFINE(HAVE_LIBCAP, 1, [SELinux libcap support])
++			SUDO_LIBS="${SUDO_LIBS} -lcap"])
++	fi
++fi
++
+ dnl
+ dnl Add in any libpaths or libraries specified via configure
+ dnl
 diff -up sudo-1.7.1/Makefile.in.audit sudo-1.7.1/Makefile.in
---- sudo-1.7.1/Makefile.in.audit	2009-05-02 22:43:42.000000000 +0200
-+++ sudo-1.7.1/Makefile.in	2009-05-02 22:05:59.000000000 +0200
+--- sudo-1.7.1/Makefile.in.audit	2009-06-22 14:24:48.000000000 +0200
++++ sudo-1.7.1/Makefile.in	2009-06-22 14:24:48.000000000 +0200
 @@ -125,6 +125,8 @@ HDRS = bsm_audit.h compat.h def_data.h d
  
  AUTH_OBJS = sudo_auth.o @AUTH_OBJS@
@@ -184,8 +209,8 @@ diff -up sudo-1.7.1/Makefile.in.audit su
  	@rm -f $(srcdir)/$@
  	( cd $(srcdir); mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; sed -n -e '/^=pod/q' -e 's/^/.\\" /p' sudo.pod > $@; pod2man --quotes=none --date="`date '+%B %e, %Y'`" --section=$$mansectsu --release=$(VERSION) --center="MAINTENANCE COMMANDS" sudo.pod | sed -e "s/(5)/($$mansectform)/" -e "s/(8)/($$mansectsu)/" | perl -p sudo.man.pl >> $@ )
 diff -up sudo-1.7.1/set_perms.c.audit sudo-1.7.1/set_perms.c
---- sudo-1.7.1/set_perms.c.audit	2009-05-02 22:43:54.000000000 +0200
-+++ sudo-1.7.1/set_perms.c	2009-05-02 22:17:04.000000000 +0200
+--- sudo-1.7.1/set_perms.c.audit	2008-03-06 18:19:56.000000000 +0100
++++ sudo-1.7.1/set_perms.c	2009-06-22 14:24:48.000000000 +0200
 @@ -48,6 +48,10 @@
  #ifdef HAVE_LOGIN_CAP_H
  # include <login_cap.h>
@@ -267,8 +292,8 @@ diff -up sudo-1.7.1/set_perms.c.audit su
  				/* assume euid == ROOT_UID, ruid == user */
  				if (setresgid(-1, SUDOERS_GID, -1))
 diff -up sudo-1.7.1/sudo.c.audit sudo-1.7.1/sudo.c
---- sudo-1.7.1/sudo.c.audit	2009-05-02 22:44:07.000000000 +0200
-+++ sudo-1.7.1/sudo.c	2009-05-02 22:32:29.000000000 +0200
+--- sudo-1.7.1/sudo.c.audit	2009-06-22 14:24:48.000000000 +0200
++++ sudo-1.7.1/sudo.c	2009-06-22 14:24:48.000000000 +0200
 @@ -95,6 +95,10 @@
  # include <selinux/selinux.h>
  #endif
@@ -340,8 +365,8 @@ diff -up sudo-1.7.1/sudo.c.audit sudo-1.
      }
      exit(0);	/* not reached */
 diff -up sudo-1.7.1/sudo.h.audit sudo-1.7.1/sudo.h
---- sudo-1.7.1/sudo.h.audit	2009-05-02 22:44:17.000000000 +0200
-+++ sudo-1.7.1/sudo.h	2009-05-02 22:33:46.000000000 +0200
+--- sudo-1.7.1/sudo.h.audit	2009-06-22 14:24:48.000000000 +0200
++++ sudo-1.7.1/sudo.h	2009-06-22 14:24:48.000000000 +0200
 @@ -24,6 +24,8 @@
  #ifndef _SUDO_SUDO_H
  #define _SUDO_SUDO_H


Index: sudo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sudo/F-11/sudo.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sudo.spec	12 May 2009 11:54:27 -0000	1.76
+++ sudo.spec	22 Jun 2009 14:31:47 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -29,6 +29,7 @@ Patch3: sudo-1.7.1-envdebug.patch
 Patch4: sudo-1.7.1-libtool.patch
 Patch5: sudo-1.7.1-getgrouplist.patch
 Patch6: sudo-1.7.1-audit.patch
+Patch7: sudo-1.7.1-conffix.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -49,6 +50,7 @@ on many different machines.
 %patch4 -p1 -b .libtool
 %patch5 -p1 -b .getgrouplist
 %patch6 -p1 -b .audit
+%patch7 -p1 -b .conffix
 
 %build
 #hande newer autoconf
@@ -135,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Mon Jun 22 2009 Daniel Kopecek <dkopecek at redhat.com> 1.7.1-2
+- fixed small bug in configure.in (sudo-1.7.1-conffix.patch)
+- sudo-1.7.1-audit.patch rediff because of missing code
+
 * Tue May 12 2009 Daniel Kopecek <dkopecek at redhat.com> 1.7.1-1
 - updated sudo to version 1.7.1