[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 3 commits: libnss-sss: Fix a typo in adding the NSS entry for automount. (LP: #1873752)

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at Debian SSSD packaging / sssd


Commits:
d0300081 by Timo Aaltonen at 2020-04-20T17:13:50+03:00
libnss-sss: Fix a typo in adding the NSS entry for automount. (LP: #1873752)

- - - - -
6e4ae9c9 by Timo Aaltonen at 2020-04-20T17:52:14+03:00
control, watch: Update upstream url to github.

- - - - -
28bd4ca2 by Timo Aaltonen at 2020-04-20T17:52:25+03:00
releasing package sssd version 2.2.3-3

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libnss-sss.postinst
- debian/libnss-sss.postrm
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+sssd (2.2.3-3) unstable; urgency=medium
+
+  * libnss-sss: Fix a typo in adding the NSS entry for automount.
+    (LP: #1873752)
+  * control, watch: Update upstream url to github.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Mon, 20 Apr 2020 17:52:18 +0300
+
 sssd (2.2.3-2) unstable; urgency=medium
 
   * libnss-sss: Add an entry for automounter to nsswitch.conf. This is


=====================================
debian/control
=====================================
@@ -64,7 +64,7 @@ Build-Depends:
 Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/sssd-team/sssd.git
 Vcs-Browser: https://salsa.debian.org/sssd-team/sssd
-Homepage: https://pagure.io/SSSD/sssd/
+Homepage: https://github.com/SSSD/sssd
 
 Package: sssd
 Section: metapackages


=====================================
debian/libnss-sss.postinst
=====================================
@@ -27,9 +27,9 @@ insert_nss_entry() {
       }
     ' /etc/nsswitch.conf
     # and add a new entry for automount if it's not there
-    if ! grep -q automounter /etc/nsswitch.conf; then
-        log "Adding an entry for automounter."
-        echo "automounter:    sss" >> /etc/nsswitch.conf
+    if ! grep -q automount /etc/nsswitch.conf; then
+        log "Adding an entry for automount."
+        echo "automount:      sss" >> /etc/nsswitch.conf
     fi
 }
 
@@ -45,6 +45,9 @@ if [ configure = "$action" ]; then
         # upgrade
         version="$2"
 
-        # Nothing to do here yet
+        # fix automount typo
+	if dpkg --compare-versions $version lt "2.2.3-3"; then
+            sed -i 's/automounter/automount/' /etc/nsswitch.conf
+        fi
     fi
 fi


=====================================
debian/libnss-sss.postrm
=====================================
@@ -22,7 +22,7 @@ remove_nss_entry() {
         s/[[:space:]]+$//
       }
     ' /etc/nsswitch.conf
-    sed -i '/^automounter/d' /etc/nsswitch.conf
+    sed -i '/^automount/d' /etc/nsswitch.conf
 }
 
 case "$1" in


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
-#git=git://pagure.io/SSSD/sssd.git
+#git=https://github.com/SSSD/sssd
 version=3
 opts="uversionmangle=s/alpha/~alpha/;s/beta/~beta/,pgpsigurlmangle=s/$/.asc/" \
 https://releases.pagure.org/SSSD/sssd/sssd-(.*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/2aea1934cc1b14e4f78f1895318c857f8907db3f...28bd4ca214d66624d60aef6f17fac3a00d585598

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/2aea1934cc1b14e4f78f1895318c857f8907db3f...28bd4ca214d66624d60aef6f17fac3a00d585598
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20200420/70ddcfb9/attachment-0001.html>