- updated to 1.8.6p7 (1.8.x line introduces plugins and i18n; 1.7.x left on sudo...

- updated patches

diff --git a/config.patch b/config.patch
index d0f6906fa0e60838830fb73dc22549084e014767..6b370ec7d6e08e6dce4effec8cf1b2e41dfec863 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,5 +1,5 @@
---- sudo-1.7.6/sudoers.in~     2010-08-18 14:25:38.000000000 +0300
-+++ sudo-1.7.6/sudoers.in      2011-08-15 19:32:35.509228012 +0300
+--- sudo-1.8.6/plugins/sudoers/sudoers.in~     2010-08-18 14:25:38.000000000 +0300
++++ sudo-1.8.6/plugins/sudoers/sudoers.in      2011-08-15 19:32:35.509228012 +0300
 @@ -55,6 +55,9 @@
  ## this may allow users to subvert the command being run via sudo.
  # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"

diff --git a/sudo-env.patch b/sudo-env.patch
index 09122f676da530724678ea1cef2f933a6a2a5655..095073d5c3ab4e1477f8e50838f78502fb2864d6 100644 (file)
--- a/sudo-env.patch
+++ b/sudo-env.patch
@@ -1,5 +1,5 @@
---- sudo-1.7.5/env.c   2011-01-24 21:39:13.000000000 +0200
-+++ sudo-1.7.5/env.c   2011-03-06 11:00:00.580457486 +0200
+--- sudo-1.8.6/plugins/sudoers/env.c   2011-01-24 21:39:13.000000000 +0200
++++ sudo-1.8.6/plugins/sudoers/env.c   2011-03-06 11:00:00.580457486 +0200
 @@ -196,12 +196,15 @@
  static const char *initial_keepenv_table[] = {
      "COLORS",

diff --git a/sudo-libtool.patch b/sudo-libtool.patch
index ce208b8b243c8e121c175a6fd09cf84b7f96b5fe..4557b8ff518d0337cc23fa390c8c7bc92d8a9636 100644 (file)
--- a/sudo-libtool.patch
+++ b/sudo-libtool.patch
@@ -1,11 +1,11 @@
---- 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-1.8.6p7/src/Makefile.in.orig  2013-02-25 20:46:09.000000000 +0100
++++ sudo-1.8.6p7/src/Makefile.in       2013-03-02 13:23:40.919719154 +0100
+@@ -109,7 +109,7 @@
+       $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS)
  
  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)
+-      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
++      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ sudo_noexec.lo -module -avoid-version -rpath $(noexecdir)
  
- # Uncomment the following if you want "make distclean" to clean the parser
- @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate
+ sesh: sesh.o error.o exec_common.o @LIBINTL@ $(LT_LIBS)
+       $(LIBTOOL) --mode=link $(CC) -o $@ sesh.o error.o exec_common.o $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) @LIBINTL@ $(LIBS)

diff --git a/sudo.spec b/sudo.spec
index 8f8c83703d419be22d51d3d5c2b2cc9ecd70aabe..e2ee85ffbcb45d798af77f44c64d3d8a8875361c 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -21,13 +21,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.10p7
+Version:       1.8.6p7
 Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: 9faa5ceaf23cca0468d0f5d211bac6e4
+# Source0-md5: 126abfa2e841139e774d4c67d80f0e5b
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
@@ -125,6 +125,17 @@ Sudo (superuser do) дозволяє системному адміністрат
 пам'ятає пароль; використання одного конфігураційного файлу (sudoers)
 на багатьох машинах.
 
+%package devel
+Summary:       Header file for sudo plugins development
+Summary(pl.UTF-8):     Plik nagłówkowy do tworzenia wtyczek dla sudo
+Group:         Development/Libraries
+
+%description devel
+Header file for sudo plugins development.
+
+%description devel -l pl.UTF-8
+Plik nagłówkowy do tworzenia wtyczek dla sudo.
+
 %package -n openldap-schema-sudo
 Summary:       Sudo LDAP schema
 Summary(pl.UTF-8):     Schemat bazy sudo dla LDAP
@@ -202,9 +213,12 @@ touch $RPM_BUILD_ROOT/var/log/sudo
 
 %if %{with ldap}
 install -d $RPM_BUILD_ROOT%{schemadir}
-cp -p schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
+cp -p doc/schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
 %endif
 
+# sudo,sudoers domains
+%find_lang %{name} --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -230,10 +244,10 @@ fi
 mv -f /var/run/sudo/* /var/db/sudo 2>/dev/null
 rmdir /var/run/sudo 2>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
-%{?with_ldap:%doc README.LDAP sudoers2ldif}
+%doc ChangeLog NEWS README doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE,sample.*}
+%{?with_ldap:%doc README.LDAP plugins/sudoers/sudoers2ldif}
 %attr(550,root,root) %dir %{_sysconfdir}/sudoers.d
 %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
@@ -244,9 +258,11 @@ rmdir /var/run/sudo 2>/dev/null || :
 %attr(755,root,root) %{_sbindir}/visudo
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
 %attr(755,root,root) %{_libdir}/sudo_noexec.so
+%attr(755,root,root) %{_libdir}/sudoers.so
 %{_mandir}/man5/sudoers.5*
 %{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}
 %{_mandir}/man8/sudo.8*
+%{_mandir}/man8/sudo_plugin.8*
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
@@ -255,6 +271,10 @@ rmdir /var/run/sudo 2>/dev/null || :
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo
 %attr(700,root,root) %dir /var/db/sudo
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/sudo_plugin.h
+
 %if %{with ldap}
 %files -n openldap-schema-sudo
 %defattr(644,root,root,755)