[ARVADOS] created: 80213c8143ff102b99aa63ac4de6576269524b28

[git at public.curoverse.com]

        at  80213c8143ff102b99aa63ac4de6576269524b28 (commit)


commit 80213c8143ff102b99aa63ac4de6576269524b28
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 13 10:34:12 2015 -0400

    6638: 6934: Fix up shellinabox example and add to package.

diff --git a/sdk/pam/examples/etc_pam.d_arvados-pam-test b/sdk/pam/examples/etc_pam.d_arvados-pam-test
deleted file mode 100644
index ddff8c7..0000000
--- a/sdk/pam/examples/etc_pam.d_arvados-pam-test
+++ /dev/null
@@ -1,3 +0,0 @@
-auth [success=1 default=ignore] pam_python.so /usr/local/lib/python2.7/dist-packages/arvados_pam/__init__.py abc.example testvm2.shell
-auth	requisite			pam_deny.so
-auth	required			pam_permit.so
diff --git a/sdk/pam/examples/etc_pam.d_shellinabox b/sdk/pam/examples/shellinabox
similarity index 75%
rename from sdk/pam/examples/etc_pam.d_shellinabox
rename to sdk/pam/examples/shellinabox
index 355a85f..3f5fe62 100644
--- a/sdk/pam/examples/etc_pam.d_shellinabox
+++ b/sdk/pam/examples/shellinabox
@@ -1,4 +1,6 @@
-# Install in /etc/pam.d/shellinabox
+# This example is a stock debian "login" file with libpam_arvados
+# replacing pam_unix, and the "noprompt" option in use. It can be
+# installed as /etc/pam.d/shellinabox .
 
 auth       optional   pam_faildelay.so  delay=3000000
 auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die] pam_securetty.so
@@ -7,7 +9,7 @@ session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux
 session       required   pam_env.so readenv=1
 session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
-auth [success=1 default=ignore] pam_python.so /usr/local/lib/python2.7/dist-packages/arvados_pam/__init__.py api.example shell.example noprompt
+auth [success=1 default=ignore] pam_python.so /lib/security/libpam_arvados.py api.example shell.example noprompt
 auth	requisite			pam_deny.so
 auth	required			pam_permit.so
 
diff --git a/sdk/pam/fpm-info.sh b/sdk/pam/fpm-info.sh
index 0c259ea..35f3d5a 100644
--- a/sdk/pam/fpm-info.sh
+++ b/sdk/pam/fpm-info.sh
@@ -13,5 +13,3 @@ case "$FORMAT" in
         fpm_args+=('--deb-recommends=system-log-daemon')
         ;;
 esac
-
-fpm_args+=('--config-files=examples/pam-auth-update_arvados')
diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 7ab4521..208644e 100755
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -34,6 +34,7 @@ setup(name='arvados-pam',
       data_files=[
           ('/usr/share/pam-configs', ['pam-configs/arvados']),
           ('/lib/security', ['lib/libpam_arvados.py']),
+          ('/usr/share/arvados-pam', ['examples/shellinabox']),
       ],
       install_requires=[
           'arvados-python-client>=0.1.20150801000000',

commit 73dcc98470b85c6b2a0aef5c0f7fb9f599e4391a
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 12 11:52:13 2015 -0400

    6638: Add package deps for llfuse and pycurl backports

diff --git a/backports/python-llfuse/fpm-info.sh b/backports/python-llfuse/fpm-info.sh
new file mode 100644
index 0000000..ecde128
--- /dev/null
+++ b/backports/python-llfuse/fpm-info.sh
@@ -0,0 +1,10 @@
+case "$TARGET" in
+    centos*)
+        build_depends+=('fuse-devel')
+        fpm_depends+=('fuse')
+        ;;
+    debian* | ubuntu*)
+        build_depends+=('libfuse-dev')
+        fpm_depends+=('fuse')
+        ;;
+esac
diff --git a/backports/python-pycurl/fpm-info.sh b/backports/python-pycurl/fpm-info.sh
new file mode 100644
index 0000000..f6643d3
--- /dev/null
+++ b/backports/python-pycurl/fpm-info.sh
@@ -0,0 +1,8 @@
+case "$TARGET" in
+    debian* | ubuntu*)
+        fpm_depends+=('libcurl4-gnutls-dev')
+        ;;
+    centos*)
+        fpm_depends+=('libcurl')
+        ;;
+esac

commit d1131e5f3d4d0d7bcfdfca3451404d6b856a6eb8
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 12 11:49:02 2015 -0400

    6638: Add python sdk package dependencies.

diff --git a/sdk/python/fpm-info.sh b/sdk/python/fpm-info.sh
new file mode 100644
index 0000000..5911d2e
--- /dev/null
+++ b/sdk/python/fpm-info.sh
@@ -0,0 +1,8 @@
+case "$TARGET" in
+    debian* | ubuntu*)
+        fpm_depends+=('libcurl4-gnutls-dev' 'libyaml-dev')
+        ;;
+    centos*)
+        fpm_depends+=('libcurl' 'libyaml')
+        ;;
+esac

-----------------------------------------------------------------------


hooks/post-receive
--