- up to 1.7.3

Changed files:
    sudo-libtool.patch -> 1.3
    sudo-pam-login.patch -> 1.6
    sudo.spec -> 1.161

diff --git a/sudo-libtool.patch b/sudo-libtool.patch
index 0ededd4bc7072f8642c642f1bb115ba1a5ddb101..ce208b8b243c8e121c175a6fd09cf84b7f96b5fe 100644 (file)
--- a/sudo-libtool.patch
+++ b/sudo-libtool.patch
@@ -1,11 +1,11 @@
---- sudo-1.6.9p3/Makefile.in.orig      2007-08-04 23:32:54.360991000 +0200
-+++ sudo-1.6.9p3/Makefile.in   2007-08-04 23:41:47.219357321 +0200
-@@ -191,7 +191,7 @@
+--- sudo-1.7.3/Makefile.in~    2010-06-19 01:41:13.000000000 +0300
++++ sudo-1.7.3/Makefile.in     2010-07-12 12:57:38.509586169 +0300
+@@ -210,7 +210,7 @@
        $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
  
- sudo_noexec.la: sudo_noexec.lo
+ libsudo_noexec.la: sudo_noexec.lo
 -      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
 +      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -module -rpath $(noexecdir)
  
  # Uncomment the following if you want "make distclean" to clean the parser
- @DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
+ @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate

diff --git a/sudo-pam-login.patch b/sudo-pam-login.patch
index 3edb12cbbaa4868f5096924e47b77d8adf6eb9dc..ed7a076ba049439c747cc393b403d2ecce90d8c9 100644 (file)
--- a/sudo-pam-login.patch
+++ b/sudo-pam-login.patch
@@ -19,25 +19,17 @@
  AC_ARG_WITH(AFS, [AS_HELP_STRING([--with-AFS], [enable AFS support])],
  [case $with_AFS in
      yes)      AC_DEFINE(HAVE_AFS)
---- sudo-1.6.9p3/sudo.c.orig   2007-08-04 22:30:23.307231082 +0200
-+++ sudo-1.6.9p3/sudo.c        2007-08-04 22:31:28.238931329 +0200
-@@ -157,6 +157,7 @@
- static char *runas_user;
- static char *runas_group;
+--- 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;
-@@ -169,7 +170,7 @@
-     char **envp;
- {
-     int sources = 0, validated;
--    int fd, cmnd_status, sudo_mode, pwflag, rc = 0;
-+    int fd, cmnd_status, pwflag, rc = 0;
-     sigaction_t sa;
-     struct sudo_nss *nss;
- #if defined(SUDO_DEVEL) && defined(__OpenBSD__)
 --- 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 @@
@@ -54,16 +46,16 @@
      if (pam_status != PAM_SUCCESS) {
        log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM");
        return(AUTH_FATAL);
---- sudo-1.6.9p3/sudo.h.orig   2007-07-06 16:14:34.000000000 +0200
-+++ sudo-1.6.9p3/sudo.h        2007-08-04 22:32:18.353787210 +0200
-@@ -268,6 +268,7 @@
- extern FILE *sudoers_fp;
+--- 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
- #ifndef errno
- extern int errno;
 --- 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 @@

diff --git a/sudo.spec b/sudo.spec
index 46c362ff439c2c251ed9c8fdf69ff92439a61329..6fc85aa3380f61e10cfbe286472e1a23a4bf7180 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -20,13 +20,13 @@ 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.2p7
-Release:       6
+Version:       1.7.3
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: 3ac78668427a53e12d7639fdfab2f1af
+# Source0-md5: c22115b47cb2591bceedb914b673f031
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
@@ -138,6 +138,8 @@ Ten pakiet zawiera sudo.schema dla pakietu openldap.
 mv -f aclocal.m4 acinclude.m4
 # kill libtool.m4 copy
 rm -f acsite.m4
+# do not load libtool macros from acinclude
+%{__sed} -i -e '/Pull in libtool macros/,$d' acinclude.m4
 
 %patch0 -p1
 %patch1 -p1
@@ -175,6 +177,9 @@ cp -f /usr/share/automake/config.sub .
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8}
 
+# makefile broken?
+touch .libs/sudo_noexec.so
+
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT \
        install_uid=$(id -u) \
@@ -230,6 +235,7 @@ fi
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo-i
 %attr(4755,root,root) %{_bindir}/sudo
 %attr(4755,root,root) %{_bindir}/sudoedit
+%attr(755,root,root) %{_bindir}/sudoreplay
 %attr(755,root,root) %{_sbindir}/visudo
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
 %attr(755,root,root) %{_libdir}/sudo_noexec.so
@@ -237,6 +243,7 @@ fi
 %{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}
 %{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
+%{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
 %attr(600,root,root) %ghost /var/log/sudo
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo