Author: glen Date: Sun Mar 6 09:40:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.7.5
- package default /var/log/sudo-io dir (for log_input/log_output io redirection)
- force system zlib (used by sudo-io logs)
- bug 440 patch applied here, seems working ok
- ldap schema adds sudoNotAfter and sudoOrder attributes
- cleanups
---- Files affected:
packages/sudo:
sudo-env.patch (1.2 -> 1.3) , sudo.spec (1.177 -> 1.178) , bug-440.patch
(1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/sudo/sudo-env.patch
diff -u packages/sudo/sudo-env.patch:1.2 packages/sudo/sudo-env.patch:1.3
--- packages/sudo/sudo-env.patch:1.2 Tue Sep 14 23:14:29 2010
+++ packages/sudo/sudo-env.patch Sun Mar 6 10:40:52 2011
@@ -1,6 +1,6 @@
---- sudo-1.6.9p6/env.c 2007-11-01 22:36:20.405065166 +0200
-+++ sudo-1.7.4p4/env.c 2010-09-15 00:12:17.263129568 +0300
-@@ -196,9 +196,11 @@
+--- 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
+@@ -196,12 +196,15 @@
static const char *initial_keepenv_table[] = {
"COLORS",
"DISPLAY",
@@ -12,11 +12,7 @@
"PATH",
"PS1",
"PS2",
-@@ -208,6 +210,7 @@
++ "SSH_AUTH_SOCK",
"TZ",
"XAUTHORITY",
"XAUTHORIZATION",
-+ "SSH_AUTH_SOCK",
- NULL
- };
-
================================================================
Index: packages/sudo/sudo.spec
diff -u packages/sudo/sudo.spec:1.177 packages/sudo/sudo.spec:1.178
--- packages/sudo/sudo.spec:1.177 Mon Jan 24 16:35:12 2011
+++ packages/sudo/sudo.spec Sun Mar 6 10:40:52 2011
@@ -21,19 +21,18 @@
Summary(ru.UTF-8): Позволяет определенным пользователям исполнять команды
от имени root
Summary(uk.UTF-8): Дозволяє вказаним користувачам виконувати команди від
імені root
Name: sudo
-Version: 1.7.4p6
+Version: 1.7.5
Release: 1
Epoch: 1
License: BSD
Group: Applications/System
Source0: ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: 1ae12d3d22e7ffedbf2db26f957676f0
+# Source0-md5: 50d39bd38bb2ef7efa05883c0b9f0f95
Source1: %{name}.pamd
Source2: %{name}-i.pamd
Source3: %{name}.logrotate
Patch0: %{name}-libtool.patch
Patch1: %{name}-env.patch
-Patch2: bug-440.patch
URL: http://www.sudo.ws/sudo/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -44,8 +43,9 @@
%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
%{?with_pam:BuildRequires: pam-devel}
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.402
+BuildRequires: rpmbuild(macros) >= 1.595
%{?with_skey:BuildRequires: skey-devel >= 2.2-11}
+BuildRequires: zlib-devel
Requires: pam >= %{pam_ver}
Obsoletes: cu-sudo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -138,15 +138,13 @@
%prep
%setup -q
# only local macros
-mv -f aclocal.m4 acinclude.m4
-# kill libtool.m4 copy
-rm -f acsite.m4
+mv aclocal.m4 acinclude.m4
# do not load libtool macros from acinclude
+cp acinclude.m4 acinclude.m4.orig
%{__sed} -i -e '/Pull in libtool macros/,$d' acinclude.m4
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__mv} install-sh install-custom-sh
@@ -168,6 +166,7 @@
--with-env-editor \
--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
--with-loglen=320 \
+ --enable-zlib=system \
--with%{!?with_kerberos5:out}-kerb5 \
--with%{!?with_ldap:out}-ldap \
--with%{!?with_skey:out}-skey \
@@ -176,12 +175,12 @@
%{__make}
+# makefile broken?
+#touch .libs/sudo_noexec.so
+
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8}
-
-# makefile broken?
-touch .libs/sudo_noexec.so
+install -d
$RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log/sudo-io,run/sudo},%{_mandir}/man8}
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -190,19 +189,16 @@
sudoers_uid=$(id -u) \
sudoers_gid=$(id -g)
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
touch $RPM_BUILD_ROOT/var/log/sudo
-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}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%if %{with ldap}
install -d $RPM_BUILD_ROOT%{schemadir}
-cp -a schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
+cp -p schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
%endif
%clean
@@ -211,10 +207,7 @@
%post -n openldap-schema-sudo
%openldap_schema_register %{schemadir}/sudo.schema -d core
%service -q ldap restart
-
-# banner on first install
-if [ "$1" = "1" ]; then
-%banner -e openldap-schema-sudo <<'EOF'
+%banner -o -e openldap-schema-sudo <<'EOF'
NOTE:
In order for sudoRole LDAP queries to be efficient, the server must index
the attribute 'sudoUser', e.g.
@@ -222,7 +215,6 @@
# Indices to maintain
index sudoUser eq
EOF
-fi
%postun -n openldap-schema-sudo
if [ "$1" = "0" ]; then
@@ -251,6 +243,7 @@
%{_mandir}/man8/sudoreplay.8*
%{_mandir}/man8/visudo.8*
%attr(600,root,root) %ghost /var/log/sudo
+%attr(700,root,root) /var/log/sudo-io
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/sudo
%attr(700,root,root) %dir /var/run/sudo
@@ -264,6 +257,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.178 2011/03/06 09:40:52 glen
+- up to 1.7.5
+- package default /var/log/sudo-io dir (for log_input/log_output io
redirection)
+- force system zlib (used by sudo-io logs)
+- bug 440 patch applied here, seems working ok
+- ldap schema adds sudoNotAfter and sudoOrder attributes
+- cleanups
+
Revision 1.177 2011/01/24 15:35:12 caleb
- Unadapterized per comments from glen.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sudo/sudo-env.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sudo/sudo.spec?r1=1.177&r2=1.178&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
