sudo-1.8.17p1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10696 ec354946-7b23-47d6-9f5a-488ba84defc7

s/sudo/sudo-vl.spec

@@ -1,7 +1,7 @@
 Summary: Allows command execution as root for specified users
 Summary(ja): スーパーユーザ権限でのコマンドの実行
 Name: sudo
-Version: 1.8.6p8
+Version: 1.8.17p1
 Release: 1%{?_dist_release}
 License: ISC-style
 Group: Applications/System
@@ -10,8 +10,10 @@ URL: http://www.sudo.ws/sudo/
 Source0: http://www.sudo.ws/sudo/dist/sudo-%{version}.tar.gz
 Source1: sudo-sudoers-vine
 
+# don't strip
 Patch1: sudo-1.6.7p5-strip.patch
-Patch4: sudo-1.7.2p1-envdebug.patch
+# Patch to read ldap.conf more closely to nss_ldap
+Patch2: sudo-1.8.14p1-ldapconfpatch.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pam-devel
@@ -21,6 +23,7 @@ BuildRequires: bison
 BuildRequires: openldap-devel
 BuildRequires: automake autoconf libtool
 BuildRequires: libcap-devel
+BuildRequires: zlib-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -38,11 +41,16 @@ sudo は、特定のユーザや特定のグループに所属するユーザが
 %prep
 %setup -q
 %patch1 -p1 -b .strip
-%patch4 -p1 -b .envdebug
+%patch2 -p1 -b .ldapconfpatch
 
-autoreconf -I m4 -fv --install
+rm -rf zlib/
 
 %build
+autoreconf -I m4 -fv --install
+
+F_PIE=-fpie
+export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+
 %configure \
   --prefix=%{_prefix} \
   --sbindir=%{_sbindir} \
@@ -69,17 +77,24 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
+
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -p -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
+install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo/lectured
 install -p -d -m 700 $RPM_BUILD_ROOT/var/log/sudo-io
 install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
 install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
 
-chmod +x $RPM_BUILD_ROOT%{_libexecdir}/*.so # for stripping, reset in %%files
+chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%files
 
 # Remove execute permission on this script so we don't pull in perl deps
 chmod -x $RPM_BUILD_ROOT%{_docdir}/sudo-*/sudoers2ldif
 
+mv -f %{buildroot}%{_docdir}/sudo-%{version} docdir
+
+#Remove all .la files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
 %find_lang sudo
 %find_lang sudoers
 
@@ -94,6 +109,7 @@ account    include      system-auth
 password   include      system-auth
 session    optional     pam_keyinit.so revoke
 session    required     pam_limits.so
+session    include      system-auth
 EOF
 
 cat > $RPM_BUILD_ROOT/etc/pam.d/sudo-i << EOF
@@ -102,7 +118,7 @@ auth       include      sudo
 account    include      sudo
 password   include      sudo
 session    optional     pam_keyinit.so force revoke
-session    required     pam_limits.so
+session    include      sudo
 EOF
 
 
@@ -112,25 +128,33 @@ rm -rf $RPM_BUILD_ROOT
 %files -f sudo_all.lang
 %defattr(-,root,root)
 %doc plugins/sample/sample_plugin.c
+%doc docdir/*
 %attr(0440,root,root) %config(noreplace) /etc/sudoers
 %attr(0750,root,root) %dir /etc/sudoers.d/
 %config(noreplace) /etc/pam.d/sudo
 %config(noreplace) /etc/pam.d/sudo-i
 %dir /var/run/sudo
+%dir /var/db/sudo
+%dir /var/db/sudo/lectured
 %attr(0750,root,root) %dir /var/log/sudo-io
 %attr(4111,root,root) %{_bindir}/sudo
-%attr(4111,root,root) %{_bindir}/sudoedit
+%{_bindir}/sudoedit
 %attr(0111,root,root) %{_bindir}/sudoreplay
 %attr(0755,root,root) %{_sbindir}/visudo
-%attr(0644,root,root) %{_libexecdir}/sudo_noexec.so
-%attr(0644,root,root) %{_libexecdir}/sudoers.so*
+%dir %{_libexecdir}/sudo
+%attr(0644,root,root) %{_libexecdir}/sudo/sudo_noexec.so
+%attr(0644,root,root) %{_libexecdir}/sudo/sudoers.so
+%attr(0644,root,root) %{_libexecdir}/sudo/group_file.so
+%attr(0644,root,root) %{_libexecdir}/sudo/system_group.so
+%attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so.?.?.?
+%{_libexecdir}/sudo/libsudo_util.so.?
+%{_libexecdir}/sudo/libsudo_util.so
 %{_mandir}/man5/sudoers*.5*
+%{_mandir}/man5/sudo.conf.5*
 %{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
-%dir %{_docdir}/sudo-%{version}
-%{_docdir}/sudo-%{version}/*
 # should be splitted to -devel?
 %{_includedir}/sudo_plugin.h
 %{_mandir}/man8/sudo_plugin.8*
@@ -140,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Sat Jul 23 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.17p1-1
+- updated to 1.8.17p1.
+- added Patch2.
+- dropped Patch4.
+
 * Mon Feb  3 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.8.6p8-1
 - update to 1.8.6p8