Upgrades from 3.0.12 to 3.0.13 resulted in most links being deleted from mods-enabled...

To update to upstream releases later than 3.0.13, it may be necessary to undo these rollbacks or manually merge around them.

diff --git a/debian/freeradius-config.postinst b/debian/freeradius-config.postinst
index 942a478..6dc9156 100644 (file)
--- a/debian/freeradius-config.postinst
+++ b/debian/freeradius-config.postinst
@@ -21,28 +21,6 @@ case "$1" in
 
           # Create snakoil certificates on initial install
           make -C /etc/freeradius/certs/
-
-          # Create links for default modules
-          for mod in always attr_filter cache_eap chap \
-              detail detail.log digest dynamic_clients eap \
-              eap_inner echo exec expiration expr files linelog logintime \
-              mschap ntlm_auth pap passwd preprocess radutmp realm \
-              replicate soh sradutmp unix unpack utf8 ; do
-            if [ ! -e /etc/freeradius/mods-enabled/$mod ]; then
-              ln -s ../mods-available/$mod /etc/freeradius/mods-enabled/$mod
-            fi
-          done
-        fi
-
-        # Create links for default sites, but only if this is an initial
-        # install or an upgrade from before there were links; users may
-        # want to remove them...
-        if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.0.4+dfsg-4; then
-          for site in default inner-tunnel; do
-            if [ ! -e /etc/freeradius/sites-enabled/$site ]; then
-              ln -s ../sites-available/$site /etc/freeradius/sites-enabled/$site
-            fi
-          done
         fi
         ;;
 esac

diff --git a/debian/freeradius-config.postrm b/debian/freeradius-config.postrm
index d90427b..e8ca770 100644 (file)
--- a/debian/freeradius-config.postrm
+++ b/debian/freeradius-config.postrm
@@ -6,20 +6,6 @@ case "$1" in
        remove)
                ;;
        purge)
-               # Remove dangling links from sites-enabled.
-               for link in /etc/freeradius/sites-enabled/*; do
-                       if [ -L "$link" ] && [ ! -e "$link" ]; then
-                               rm -f "$link"
-                       fi
-               done
-
-               # Remove dangling links from mods-enabled.
-               for link in /etc/freeradius/mods-enabled/*; do
-                       if [ -L "$link" ] && [ ! -e "$link" ]; then
-                               rm -f "$link"
-                       fi
-               done
-
                if dpkg-statoverride --list | grep -qw /etc/freeradius/dictionary$; then
                        dpkg-statoverride --remove /etc/freeradius/dictionary
                fi

diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index 4fb2af3..4265cac 100644 (file)
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -55,6 +55,17 @@ case "$1" in
           action="restart"
         fi
 
+        # Create links for default sites, but only if this is an initial
+        # install or an upgrade from before there were links; users may
+        # want to remove them...
+        if [ -z "$2" ] || dpkg --compare-versions "$2" lt 2.0.4+dfsg-4; then
+          for site in default inner-tunnel; do
+            if [ ! -e /etc/freeradius/sites-enabled/$site ]; then
+              ln -s ../sites-available/$site /etc/freeradius/sites-enabled/$site
+            fi
+          done
+        fi
+
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
           invoke-rc.d freeradius $action || true
         else

diff --git a/debian/freeradius.postrm b/debian/freeradius.postrm
index 97c7b4f..7dfeea9 100644 (file)
--- a/debian/freeradius.postrm
+++ b/debian/freeradius.postrm
@@ -8,6 +8,13 @@ case "$1" in
         purge)
                update-rc.d -f freeradius remove >/dev/null
 
+               # Remove dangling links from sites-enabled.
+               for link in /etc/freeradius/sites-enabled/*; do
+                 if [ -L "$link" ] && [ ! -e "$link" ]; then
+                   rm -f "$link"
+                 fi
+               done
+
               if [ -L /etc/freeradius/certs/server.pem ]; then
                 rm -f /etc/freeradius/certs/server.pem
               fi

diff --git a/debian/rules b/debian/rules
index 6e02810..9d1867e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -156,11 +156,6 @@ install-arch: build-arch-stamp
        mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
        mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
 
-       # don't package symlinks in sites-enabled and mods-enabled - they're
-       # created on install by freeradius-config.postinst
-       rm $(freeradius_dir)/etc/freeradius/sites-enabled/*
-       rm $(freeradius_dir)/etc/freeradius/mods-enabled/*
-
        dh_install -i --sourcedir=$(freeradius_dir)
        dh_install --sourcedir=$(freeradius_dir) -p libfreeradius3
        dh_install --sourcedir=$(freeradius_dir) -p libfreeradius-dev