- up to 1.7.4

Changed files:
    sudo-pam-login.patch -> 1.7
    sudo.spec -> 1.163

diff --git a/sudo-pam-login.patch b/sudo-pam-login.patch
deleted file mode 100644 (file)
index ed7a076..0000000
--- a/sudo-pam-login.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- sudo-1.6.8p12/configure.in.login   2006-07-16 15:25:33.000000000 +0200
-+++ sudo-1.6.8p12/configure.in 2006-07-16 15:49:08.000000000 +0200
-@@ -394,6 +394,18 @@
-               ;;
- esac])
- 
-+AC_ARG_WITH(pam-login, [AS_HELP_STRING([--with-pam-login],[enable specific PAM session for sudo -i])],
-+[case $with_pam_login in
-+    yes)      AC_DEFINE(HAVE_PAM_LOGIN)
-+              AC_MSG_CHECKING(whether to use PAM login)
-+              AC_MSG_RESULT(yes)
-+              ;;
-+    no)
-+              ;;
-+     *)               AC_MSG_ERROR(["--with-pam-login does not take an argument."])
-+              ;;
-+esac])
-+
- AC_ARG_WITH(AFS, [AS_HELP_STRING([--with-AFS], [enable AFS support])],
- [case $with_AFS in
-     yes)      AC_DEFINE(HAVE_AFS)
---- sudo-1.7.3/sudo.c~ 2010-06-29 19:33:55.000000000 +0300
-+++ sudo-1.7.3/sudo.c  2010-07-12 12:56:28.390424928 +0300
-@@ -147,7 +147,7 @@
- char *runas_user;
- char *runas_group;
- static struct sudo_nss_list *snl;
--static int sudo_mode;
-+int sudo_mode;
- 
- /* For getopt(3) */
- extern char *optarg;
---- sudo-1.6.8p12/auth/pam.c.login     2006-07-16 15:41:59.000000000 +0200
-+++ sudo-1.6.8p12/auth/pam.c   2006-07-16 15:45:15.000000000 +0200
-@@ -89,7 +89,12 @@
-     if (auth != NULL)
-       auth->data = (VOID *) &pam_status;
-     pam_conv.conv = sudo_conv;
--    pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh);
-+#ifdef HAVE_PAM_LOGIN
-+    if (ISSET(sudo_mode, MODE_LOGIN_SHELL))
-+          pam_status = pam_start("sudo-i", pw->pw_name, &pam_conv, &pamh);
-+    else
-+#endif
-+          pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh);
-     if (pam_status != PAM_SUCCESS) {
-       log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM");
-       return(AUTH_FATAL);
---- sudo-1.7.3/sudo.h~ 2010-06-29 19:58:19.000000000 +0300
-+++ sudo-1.7.3/sudo.h  2010-07-12 12:55:18.229600104 +0300
-@@ -356,6 +356,7 @@
- extern int tgetpass_flags;
- extern int long_list;
- extern uid_t timestamp_uid;
-+extern int sudo_mode;
- /* XXX - conflicts with the one in visudo */
- int run_command __P((const char *path, char *argv[], char *envp[], uid_t uid, int dowait));
- #endif
---- sudo-1.6.8p12/config.h.in.login    2006-07-16 15:32:09.000000000 +0200
-+++ sudo-1.6.8p12/config.h.in  2006-07-16 15:32:56.000000000 +0200
-@@ -230,6 +230,9 @@
- /* Define to 1 if you use PAM authentication. */
- #undef HAVE_PAM
- 
-+/* Define to 1 if you use specific PAM session for sodo -i. */
-+#undef HAVE_PAM_LOGIN
-+
- /* Define to 1 if you have the <pam/pam_appl.h> header file. */
- #undef HAVE_PAM_PAM_APPL_H
- 

diff --git a/sudo.spec b/sudo.spec
index 24c875c4319145507be3e40844b98ed23bf5fdd6..aaa60a97b11de89ada1dfaeaef831d50c36279e3 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -20,19 +20,18 @@ Summary(pt_BR.UTF-8):       Permite que usuários específicos executem comandos como
 Summary(ru.UTF-8):     Позволяет определенным пользователям исполнять команды от имени root
 Summary(uk.UTF-8):     Дозволяє вказаним користувачам виконувати команди від імені root
 Name:          sudo
-Version:       1.7.3
-Release:       2
+Version:       1.7.4
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: c22115b47cb2591bceedb914b673f031
+# Source0-md5: 346b942e6e31885cb313b2e45e70338c
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
-Patch0:                %{name}-pam-login.patch
-Patch1:                %{name}-libtool.patch
-Patch2:                %{name}-env.patch
+Patch0:                %{name}-libtool.patch
+Patch1:                %{name}-env.patch
 URL:           http://www.sudo.ws/sudo/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -143,7 +142,6 @@ rm -f acsite.m4
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__mv} install-sh install-custom-sh
@@ -195,6 +193,7 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
 chmod -R +r $RPM_BUILD_ROOT%{_prefix}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/sudo_noexec.la
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %if %{with ldap}
 install -d $RPM_BUILD_ROOT%{schemadir}
@@ -228,7 +227,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc HISTORY README TROUBLESHOOTING sample.sudoers
+%doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
 %{?with_ldap:%doc README.LDAP sudoers2ldif}
 %attr(440,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/sudoers
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo