diff options
| author | Steve Langasek <vorlon@debian.org> | 2011-09-25 15:10:54 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:46 -0800 |
| commit | 616670d6ecb69282a2076417afe65ae7d97faf13 (patch) | |
| tree | e1ec54f158bc50b5669011804a98369b0a66c6a2 | |
| parent | 92b37e4e4efc17c68c81ed8bae4a2614133fc906 (diff) | |
| download | pam-616670d6ecb69282a2076417afe65ae7d97faf13.tar.gz pam-616670d6ecb69282a2076417afe65ae7d97faf13.tar.bz2 pam-616670d6ecb69282a2076417afe65ae7d97faf13.zip | |
Make sure shared library links are also installed to the multiarch
directory, not just the .a files; otherwise the static libs get found
first by the linker. Thanks to Russ Allbery for catching this.
Closes: #642952.
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/libpam0g-dev.links.in | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 9f6a5f39..55731956 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pam (1.1.3-4) UNRELEASED; urgency=low + + * Make sure shared library links are also installed to the multiarch + directory, not just the .a files; otherwise the static libs get found + first by the linker. Thanks to Russ Allbery for catching this. + Closes: #642952. + + -- Steve Langasek <vorlon@debian.org> Sun, 25 Sep 2011 15:10:02 -0700 + pam (1.1.3-3) unstable; urgency=low * Look for /etc/init.d/postgresql, not /etc/init.d/postgresql-8.{2,3}, diff --git a/debian/libpam0g-dev.links.in b/debian/libpam0g-dev.links.in index f595eeb9..ee062368 100644 --- a/debian/libpam0g-dev.links.in +++ b/debian/libpam0g-dev.links.in @@ -1,3 +1,3 @@ -/lib/libpam.so.0 usr/lib/libpam.so -/lib/libpamc.so.0 usr/lib/libpamc.so -/lib/libpam_misc.so.0 usr/lib/libpam_misc.so +/lib/@DEB_HOST_MULTIARCH@/libpam.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpam.so +/lib/@DEB_HOST_MULTIARCH@/libpamc.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpamc.so +/lib/@DEB_HOST_MULTIARCH@/libpam_misc.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libpam_misc.so diff --git a/debian/rules b/debian/rules index f24686c2..e1a566d2 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ override_dh_installman: # dh_link doesn't do wildcards, so we can't auto-link to the right per-arch # directory override_dh_link: - sed -e"s,^/lib,/lib/$(DEB_HOST_MULTIARCH)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links + sed -e"s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links dh_link # using perms that differ from upstream (sgid instead of suid) /and/ that |