dependency update

Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood

Conflicts:

	debian/control

3 files changed, 76 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index fba566b7..56e21623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,74 @@
+vyatta-cfg-system (0.15.101) unstable; urgency=low
+
+  * Remove blank line
+  * Show dependency on pam version
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Wed, 11 Nov 2009 17:09:29 -0800
+
+vyatta-cfg-system (0.15.100) unstable; urgency=low
+
+  * copy the whole config directory during install
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Tue, 10 Nov 2009 14:08:59 -0800
+
+vyatta-cfg-system (0.15.99) unstable; urgency=low
+
+  [ An-Cheng Huang ]
+  * use new vyatta-union arg to reduce kernel cmdline length.
+
+  [ Robert Bays ]
+  * Fix library include
+
+ -- Robert Bays <rbays@roatan>  Fri, 06 Nov 2009 05:53:10 -0800
+
+vyatta-cfg-system (0.15.98) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Remove blank line
+  * Fix pam-auth-update errors from radius
+  * Move user configuration information to files
+  * radius: only try first password if first module
+
+  [ An-Cheng Huang ]
+  * move custom script to custom repo
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Thu, 05 Nov 2009 15:01:40 -0800
+
+vyatta-cfg-system (0.15.97) unstable; urgency=low
+
+  * Fix 5063: committing "set interfaces ethernet <> bridge-group bridge
+    <>" got "invalid variable reference (invalid format)"
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Mon, 02 Nov 2009 18:31:22 -0800
+
+vyatta-cfg-system (0.15.96) unstable; urgency=low
+
+  [ An-Cheng Huang ]
+  * use top-level pid for progress indicator
+
+  [ Stephen Hemminger ]
+  * Don't want/need --package option to pam-auth-update
+  * Reset PAM configuration on boot
+  * rename pam-radius to pam_radius.cfg
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Mon, 02 Nov 2009 17:28:17 -0800
+
+vyatta-cfg-system (0.15.95) unstable; urgency=low
+
+  [ David S. Madole ]
+  * Add VRRP capability to bonding interfaces and vifs of bonding
+    interfaces.
+
+  [ Stig Thormodsrud ]
+  * Convert keepalived to use Interface infrastructure.
+  * Add priority for bonding vrrp nodes.
+  * Fix interface carrier status.
+  * Fix 'show vrrp summary' showing last vip 1st
+  * Using Interface.pm infrastructure to detect vif on eth|bond
+    interface.
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Sun, 01 Nov 2009 14:59:29 -0800
+
 vyatta-cfg-system (0.15.94) unstable; urgency=low
 
   [ An-Cheng Huang ]
diff --git a/debian/control b/debian/control
index 5d875e70..ba8d3655 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Depends:  acpid,
  coreutils (>= 5.97-5.3),
  libpam-radius-auth,
  vyatta-cfg (>= 0.15.33),
+ libpam-runtime (>= 1.0.1-5),
  vyatta-bash | bash (>= 3.1),
  sysv-rc,
  ntp,
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 95fcd1ca..4809c4fe 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -118,6 +118,10 @@ EOF
         fi
     done
 
+    # Install pamradius config (should come with radius client eventually)
+    cp $sysconfdir/pam_radius.cfg /usr/share/pam-configs/radius
+
+    cp $sysconfdir/level $sysconfdir/protected-user /opt/vyatta/etc
 fi
 
 # update crontab for logrotate
@@ -148,8 +152,6 @@ update-rc.d -f ssh remove >/dev/null
 # for password
 sed -i 's/requisite[ \t][ \t]*pam_securetty.so/required pam_securetty.so/' $rootfsdir/etc/pam.d/login
 
-# Install pamradius config (should come with radius client eventually)
-cp $sysconfdir/pam-radius /usr/share/pam-configs/radius
 
 [ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist