Merge ~ahasenack/ubuntu/+source/sssd:sssd-ftbfs-1780783 into ubuntu/+source/sssd:ubuntu/devel

[Andreas Hasenack]

Revert changes introduced in 1.16.1-1ubuntu3. They can be seen with "git show import/1.16.1-1ubuntu3" or here: https://git.launchpad.net/ubuntu/+source/sssd/commit/?id=39e4993bf605d89aaa8aaafc562838ed3422d7ef

Just now it occurred to me that I could have used "git revert", and then adjusted d/changelog. Please let me know if you think that is best.

PPA with test packages, showing that the build works: https://launchpad.net/~ahasenack/+archive/ubuntu/sssd-ftbfs-1780783

[Andreas Hasenack (ahasenack)]

Ah, no, forget the revert idea, there were correct fixes in that commit, it's just the /usr/local bit that was wrong.

[Robie Basak (racb)]

lgtm

You could use "git revert -n pkg/ubuntu/devel", "git reset" and then "git add -p" to selectively revert. I did this for review, using "e" to change the hunks to only drop the local/ bit (and the deletion of the init script), and verified that my result was identical to yours.

review: Approve

[Andreas Hasenack (ahasenack)]

Good to know, thanks.

diff --git a/debian/changelog b/debian/changelog
index 73038e0..8e8f47f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sssd (1.16.1-1ubuntu4) cosmic; urgency=medium
+
+  * d/p/python3-libipa-hbac.install, d/p/python3-libsss-nss-idmap.install,
+    d/p/python3-sss.install: modules go in /usr/lib/python3*, not
+    /usr/local/lib/python3* (LP: #1780783)
+  * d/sssd-common.sssd.init: drop initscript that was accidentally added
+    in 1.16.1-1ubuntu3.
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 10 Jul 2018 17:21:22 -0300
+
 sssd (1.16.1-1ubuntu3) cosmic; urgency=medium
 
   * Fix installation of the python3 modules.
diff --git a/debian/python3-libipa-hbac.install b/debian/python3-libipa-hbac.install
index 5534bf5..f9cc4b8 100644
--- a/debian/python3-libipa-hbac.install
+++ b/debian/python3-libipa-hbac.install
@@ -1 +1 @@
-usr/local/lib/python3*/*-packages/pyhbac.so
+usr/lib/python3*/*-packages/pyhbac.so
diff --git a/debian/python3-libsss-nss-idmap.install b/debian/python3-libsss-nss-idmap.install
index 69fa8da..84b79ee 100644
--- a/debian/python3-libsss-nss-idmap.install
+++ b/debian/python3-libsss-nss-idmap.install
@@ -1 +1 @@
-usr/local/lib/python3*/*-packages/pysss_nss_idmap.so
+usr/lib/python3*/*-packages/pysss_nss_idmap.so
diff --git a/debian/python3-sss.install b/debian/python3-sss.install
index f8bdedf..858c845 100644
--- a/debian/python3-sss.install
+++ b/debian/python3-sss.install
@@ -1,3 +1,3 @@
 usr/lib/python3*/*-packages/SSSDConfig/*.py
-usr/local/lib/python3*/*-packages/pysss.so
-usr/local/lib/python3*/*-packages/pysss_murmur.so
+usr/lib/python3*/*-packages/pysss.so
+usr/lib/python3*/*-packages/pysss_murmur.so
diff --git a/debian/sssd-common.sssd.init b/debian/sssd-common.sssd.init
 deleted file mode 100644
index 390a6e2..0000000
--- a/debian/sssd-common.sssd.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          sssd
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: System Security Services Daemon
-# Description:       Provides a set of daemons to manage access to
-#                    remote directories and authentication
-#                    mechanisms. It provides an NSS and PAM interface
-#                    toward the system and a pluggable backend system
-#                    to connect to multiple different account sources.
-### END INIT INFO
-# start on filesystem
-# stop on runlevel [06]
-
-DESCRIPTION="System Security Services Daemon"
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=sssd
-DAEMON_OPTS=""
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/sssd ] ; then
-    . /etc/default/sssd
-fi
-
-initdmain() {
-    case "$1" in
-        start)
-            [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESCRIPTION" "$NAME"
-            start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-            RC=$?
-            case "$RC" in
-                0)
-                    [ "$VERBOSE" != no ] && log_end_msg $RC
-                    ;;
-                *)
-                # Report error also when VERBOSE=no
-                    log_daemon_msg "Starting $DESCRIPTION" "$NAME"
-                    log_end_msg $RC
-                    ;;
-            esac
-            ;;
-        stop)
-            [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESCRIPTION" "$NAME"
-            killproc -p $PIDFILE $DAEMON
-            RC=$?
-            case "$RC" in
-                0)
-                    [ "$VERBOSE" != no ] && log_end_msg $RC
-                    ;;
-                *)
-                # Report error also when VERBOSE=no
-                    log_daemon_msg "Stopping $DESCRIPTION" "$NAME"
-                    log_end_msg $RC
-                    ;;
-            esac
-            ;;
-        force-reload|restart)
-            $0 stop
-            $0 start
-            ;;
-        status)
-            status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-            ;;
-        *)
-            echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}"
-            exit 1
-            ;;
-    esac
-}
-
-initdmain $@
-
-exit 0