Package: sudo-ldap
Version: 1.8.2-1
Severity: normal
Tags: patch
Usertags: pca-server

Hi there!

While looking at how to configure sudo to work with OpenLDAP, I
discovered that there are two problems with the various example files
provided with the package:

1) sample.sudoers is shipped twice
=====
$ grep sample.sudoers /var/lib/dpkg/info/sudo-ldap.md5sums
030fe9a80892c8f8486e202ca9c375b6  
usr/share/doc/sudo-ldap/examples/sample.sudoers
030fe9a80892c8f8486e202ca9c375b6  usr/share/doc/sudo-ldap/sample.sudoers
=====

2) some examples are provided in /u/s/d/sudo-ldap and not in the
   examples subfolder

Here is a patch to solve both issues.  Given that it seems some commits
have not been pushed to the online Git repository yet (e.g. the new
upstream version closes both #637449 and #621830), the patch is against
the latest source available in Debian:

--8<---------------cut here---------------start------------->8---
diff -Naur sudo-1.8.2.ORG/debian/changelog sudo-1.8.2/debian/changelog
--- sudo-1.8.2.ORG/debian/changelog     2011-08-24 22:16:15.000000000 +0200
+++ sudo-1.8.2/debian/changelog 2011-09-23 17:38:34.918515547 +0200
@@ -1,3 +1,12 @@
+sudo (1.8.2-2) UNRELEASED; urgency=low
+
+  [ Luca Capello ]
+  * debian/rules (Closes: #NNN):
+    + mv upstream sample.* files to the examples folder.
+    - do not call dh_installexamples.
+
+ --
+
 sudo (1.8.2-1) unstable; urgency=low
 
   * new upstream version, closes: #637449, #621830
diff -Naur sudo-1.8.2.ORG/debian/rules sudo-1.8.2/debian/rules
--- sudo-1.8.2.ORG/debian/rules 2011-08-24 22:16:15.000000000 +0200
+++ sudo-1.8.2/debian/rules     2011-09-23 17:39:13.707526158 +0200
@@ -104,6 +104,12 @@
                debian/sudo-ldap/usr/share/doc/sudo-ldap/
        rmdir   debian/sudo-ldap/usr/share/doc/sudo
 
+       # move sample files to the examples folder
+       mv      debian/sudo/usr/share/doc/sudo/sample.* \
+               debian/sudo/usr/share/doc/sudo/examples/
+       mv      debian/sudo-ldap/usr/share/doc/sudo-ldap/sample.* \
+               debian/sudo-ldap/usr/share/doc/sudo-ldap/examples/
+
        # and install things we do want that make install doesn't know about
        install -o root -g root -m 0644 debian/sudo.pam \
                debian/sudo/etc/pam.d/sudo
@@ -131,7 +137,6 @@
        dh_testdir
        dh_testroot
        dh_installdocs -A
-       dh_installexamples -A doc/sample.sudoers
        dh_installinit -psudo -psudo-ldap --name=sudo
        dh_installman -A
        dh_installinfo -A
--8<---------------cut here---------------end--------------->8---

Thx, bye,
Gismo / Luca

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.1.0-rc4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages sudo-ldap depends on:
ii  libc6           2.13-21 
ii  libldap-2.4-2   2.4.25-3
ii  libpam-modules  1.1.3-2 
ii  libpam0g        1.1.3-2 

sudo-ldap recommends no packages.

sudo-ldap suggests no packages.

-- Configuration Files:
/etc/sudoers [Errno 13] Permission denied: u'/etc/sudoers'
/etc/sudoers.d/README [Errno 13] Permission denied: u'/etc/sudoers.d/README'

-- no debconf information

Attachment: pgp1iXenKgX4r.pgp
Description: PGP signature

Reply via email to