[Pkg-sssd-devel] sssd: Changes to 'debian-unstable'
Timo Aaltonen
tjaalton-guest at alioth.debian.org
Fri Jan 18 12:40:14 UTC 2013
debian/changelog | 15 +++++++++++++--
debian/control | 3 ++-
debian/libnss-sss.postinst | 19 +++++--------------
debian/libnss-sss.postrm | 17 +++++------------
debian/libpam-sss.pam-auth-update | 5 -----
debian/libpam-sss.pam-auth-update-password | 9 +++++++++
debian/rules | 6 +++---
7 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 34163ba0cea62f5deafece330c46f8538fb4f518
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Fri Jan 18 12:42:54 2013 +0200
rewrap changelog
diff --git a/debian/changelog b/debian/changelog
index 6be133b..a5eb70b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,14 +3,16 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
* rules: Fix the current date format, and move the date mangling to
happen before dh_install is run. (Closes: #670019)
* sssd.{preinst,postrm}: Install the apparmor profile in force-complain
- mode on install, and remove the profile directory on purge (if empty). Also
- migrate from previous setup which installed it as disabled. (Closes: #676140)
+ mode on install, and remove the profile directory on purge (if empty).
+ Also migrate from previous setup which installed it as disabled.
+ (Closes: #676140)
* Replace perl snippet from libnss-sss.post* with sed, drop perl from
Depends. (Closes: #686237)
* libpam-sss.pam-auth-update*: Add a separate file for the password stack,
and drop it from the main file. It needs to have a higher priority
from the rest so that password changes work with pam_cracklib installed.
- * rules: Drop remnants of cdbs, use proper paths for configure. (LP: #1079938)
+ * rules: Drop remnants of cdbs, use proper paths for configure.
+ (LP: #1079938)
* libnss-sss.postinst: SSSD doesn't handle shadow maps, so don't pretend
that it would.
* control: Mark sssd as Multi-Arch: foreign.
commit 74da4506d6f96b00ca1051348380041ef32bc4e6
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Fri Jan 18 12:25:30 2013 +0200
fix krb5-plugin-path
diff --git a/debian/rules b/debian/rules
index 359890b..148bf6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_configure:
dh_auto_configure -- --enable-krb5-locator-plugin \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--with-ldb-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/ldb/modules/ldb \
- --with-krb5-plugin-path=/usr/krb5/plugins/libkrb5 \
+ --with-krb5-plugin-path=/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins/libkrb5 \
--enable-nsslibdir=/lib/$(DEB_HOST_MULTIARCH) \
--enable-pammoddir=/lib/$(DEB_HOST_MULTIARCH)/security \
--disable-static \
commit 3d4f1d626bdf5ba590790d0967f2ae84344340f3
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Fri Jan 18 12:21:48 2013 +0200
control: Mark sssd as Multi-Arch: foreign.
diff --git a/debian/changelog b/debian/changelog
index b9e1fea..6be133b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
* rules: Drop remnants of cdbs, use proper paths for configure. (LP: #1079938)
* libnss-sss.postinst: SSSD doesn't handle shadow maps, so don't pretend
that it would.
+ * control: Mark sssd as Multi-Arch: foreign.
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 05 Jun 2012 11:39:33 +0300
diff --git a/debian/control b/debian/control
index c94d29e..7551083 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Homepage: https://fedorahosted.org/sssd/
Package: sssd
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, python,
python-sss,
libipa-hbac0 (= ${binary:Version}),
commit 9b0600208372d89e34b889bb921e7822bb14393d
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Dec 4 11:17:12 2012 +0200
libnss-sss.postinst: SSSD doesn't handle shadow maps, so don't pretend that it would.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 2a573c0..b9e1fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
and drop it from the main file. It needs to have a higher priority
from the rest so that password changes work with pam_cracklib installed.
* rules: Drop remnants of cdbs, use proper paths for configure. (LP: #1079938)
+ * libnss-sss.postinst: SSSD doesn't handle shadow maps, so don't pretend
+ that it would.
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 05 Jun 2012 11:39:33 +0300
diff --git a/debian/libnss-sss.postinst b/debian/libnss-sss.postinst
index 49c6145..13a2f12 100755
--- a/debian/libnss-sss.postinst
+++ b/debian/libnss-sss.postinst
@@ -22,7 +22,7 @@ insert_nss_entry() {
fi
# append 'sss' to the end of the line if it's not found already
sed -i --regexp-extended '
- /^(passwd|group|shadow|netgroup):/ {
+ /^(passwd|group|netgroup):/ {
/\bsss\b/! s/$/ sss/
}
' /etc/nsswitch.conf
commit 97c7382950d58bdd9f847435f57bfe11ec837189
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Tue Dec 4 11:14:48 2012 +0200
rules: Drop remnants of cdbs, use proper paths for configure. (LP: #1079938)
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 3566531..2a573c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
* libpam-sss.pam-auth-update*: Add a separate file for the password stack,
and drop it from the main file. It needs to have a higher priority
from the rest so that password changes work with pam_cracklib installed.
+ * rules: Drop remnants of cdbs, use proper paths for configure. (LP: #1079938)
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 05 Jun 2012 11:39:33 +0300
diff --git a/debian/rules b/debian/rules
index f888610..359890b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,9 @@ endif
override_dh_auto_configure:
dh_auto_configure -- --enable-krb5-locator-plugin \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --with-ldb-lib-dir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/ldb/modules/ldb \
- --with-krb5-plugin-path=\$${libdir}/krb5/plugins/libkrb5 \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ --with-ldb-lib-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/ldb/modules/ldb \
+ --with-krb5-plugin-path=/usr/krb5/plugins/libkrb5 \
--enable-nsslibdir=/lib/$(DEB_HOST_MULTIARCH) \
--enable-pammoddir=/lib/$(DEB_HOST_MULTIARCH)/security \
--disable-static \
commit 4549db71384bc89367626465a5bc98b4763a81f9
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Wed Nov 21 18:50:39 2012 +0200
libpam-sss.pam-auth-update*: Add a separate file for the password stack
and drop it from the main file. It needs to have a higher priority
from the rest so that password changes work with pam_cracklib
installed.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 4468baf..3566531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
migrate from previous setup which installed it as disabled. (Closes: #676140)
* Replace perl snippet from libnss-sss.post* with sed, drop perl from
Depends. (Closes: #686237)
+ * libpam-sss.pam-auth-update*: Add a separate file for the password stack,
+ and drop it from the main file. It needs to have a higher priority
+ from the rest so that password changes work with pam_cracklib installed.
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 05 Jun 2012 11:39:33 +0300
diff --git a/debian/libpam-sss.pam-auth-update b/debian/libpam-sss.pam-auth-update
index c6948b8..7d719e4 100644
--- a/debian/libpam-sss.pam-auth-update
+++ b/debian/libpam-sss.pam-auth-update
@@ -11,11 +11,6 @@ Account-Type: Additional
Account:
sufficient pam_localuser.so
[default=bad success=ok user_unknown=ignore] pam_sss.so
-Password-Type: Primary
-Password:
- sufficient pam_sss.so
-Password-Initial:
- sufficient pam_sss.so
Session-Type: Additional
Session-Interactive-Only: yes
Session:
diff --git a/debian/libpam-sss.pam-auth-update-password b/debian/libpam-sss.pam-auth-update-password
new file mode 100644
index 0000000..7c3f221
--- /dev/null
+++ b/debian/libpam-sss.pam-auth-update-password
@@ -0,0 +1,9 @@
+Name: SSS password change
+Default: yes
+Priority: 512
+
+Password-Type: Primary
+Password:
+ sufficient pam_sss.so use_authtok
+Password-Initial:
+ sufficient pam_sss.so
commit e4103fe8751a49b5a543e0768d4c076372993696
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date: Mon Nov 19 12:47:46 2012 +0200
Replace perl snippet from libnss-sss.post* with sed, drop perl from Depends. (Closes: #686237)
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index a0a641a..4468baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sssd (1.8.4-2) UNRELEASED; urgency=low
* sssd.{preinst,postrm}: Install the apparmor profile in force-complain
mode on install, and remove the profile directory on purge (if empty). Also
migrate from previous setup which installed it as disabled. (Closes: #676140)
+ * Replace perl snippet from libnss-sss.post* with sed, drop perl from
+ Depends. (Closes: #686237)
-- Timo Aaltonen <tjaalton at ubuntu.com> Tue, 05 Jun 2012 11:39:33 +0300
diff --git a/debian/control b/debian/control
index ebd481e..c94d29e 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ Description: System Security Services Daemon -- tools
Package: libnss-sss
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, perl
+Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: multiarch-support
Recommends: sssd
Multi-Arch: same
diff --git a/debian/libnss-sss.postinst b/debian/libnss-sss.postinst
index 8163f57..49c6145 100755
--- a/debian/libnss-sss.postinst
+++ b/debian/libnss-sss.postinst
@@ -20,20 +20,11 @@ insert_nss_entry() {
log "Could not find /etc/nsswitch.conf."
return
fi
- perl -i -pe '
- sub insert {
- # this also splits on tab
- my @bits=split(" ", shift);
- # do not break configuration if the line already
- # references sss
- if (grep { $_ eq "sss"} @bits) {
- return join " ", @bits;
- }
- # append sss at the end
- push @bits, "sss";
- return join " ", at bits;
- }
- s/^(passwd:\s+|group:\s+|shadow:\s+|netgroup:\s+)(.*)/$1.insert($2)/e;
+ # append 'sss' to the end of the line if it's not found already
+ sed -i --regexp-extended '
+ /^(passwd|group|shadow|netgroup):/ {
+ /\bsss\b/! s/$/ sss/
+ }
' /etc/nsswitch.conf
}
diff --git a/debian/libnss-sss.postrm b/debian/libnss-sss.postrm
index 304827f..baae1b1 100755
--- a/debian/libnss-sss.postrm
+++ b/debian/libnss-sss.postrm
@@ -16,18 +16,11 @@ remove_nss_entry() {
log "Could not find /etc/nsswitch.conf."
return
fi
- perl -i -pe '
- my @remove=(
- "sss",
- );
- sub remove {
- my $s=shift;
- foreach my $bit (@remove) {
- $s=~s/\s+\Q$bit\E//g;
- }
- return $s;
- }
- s/^(passwd:|group:|shadow:|netgroup:)(.*)/$1.remove($2)/e;
+ sed -i --regexp-extended '
+ /^(passwd|group|shadow|netgroup):/ {
+ s/\bsss\b//g
+ s/[[:space:]]+$//
+ }
' /etc/nsswitch.conf
}
More information about the Pkg-sssd-devel
mailing list