From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Fri, 18 Oct 2013 14:55:00 +0000 (+0200)
Subject: No special handling for aai packages.
X-Git-Tag: debian/7.0.1~1
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=50f8f7af6ef50eb419bf55e062a4b2b1a9943171

No special handling for aai packages.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index bca50ee..72319c2 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -29,8 +29,6 @@ true				install_keyrings	# install new keys
 true				restore_configs
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
-pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		pkgadd openldap-aai
 pkg amavisd-new			upgrade_amavis
 pkg mysql-server-5.1		upgrade_mysql
 pkg apache2-cn			upgrade_apache2
diff --git a/src/functions.sh b/src/functions.sh
index 0e12ecb..2fbcacd 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -891,33 +891,6 @@ upgrade_amavis () {
   /etc/init.d/amavisd-cn restart
 }
 
-# handle freerdius upgrade
-upgrade_freeradius () {
-  local password
-
-  pkg freeradius-aai lt 2.1.12~srce1 || return 0
-
-  # aai team prevents a normal upgrade
-  cp -av /etc/freeradius /etc/freeradius.$backup_ext
-  pkgrm freeradius-aai freeradius-ldap freeradius
-  rm -rf /etc/freeradius/certs
-  pkgadd freeradius-aai
-
-  # sync localhost passwords
-  if pkg libpam-radius-auth && [ -f "/etc/pam_radius_auth.conf" ]; then
-    pkgadd libpam-radius-auth
-    password=$(
-      sed -n '/^[[:space:]]*client[[:space:]]\+localhost/,/^[[:space:]]*}/ { /^[[:space:]]*secret[[:space:]]*=[[:space:]]*\([^[:space:]]*\)/s//\1/p }' /etc/freeradius/clients.conf
-    )
-    if [ "$password" ] \
-       && ! grep -q "^127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+$password[[:space:]]\+" \
-         /etc/pam_radius_auth.conf
-    then
-      sed -i.$backup_ext "s/^\(127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+\)[^[:space:]]\+\(.*\)/\1$password\3/" /etc/pam_radius_auth.conf
-    fi
-  fi
-}
-
 # handle mysql 5.0 to 5.1 upgrade
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.1; then