Synced with upstream debian
authorAlan T. DeKok <aland@freeradius.org>
Mon, 21 Dec 2009 09:49:50 +0000 (10:49 +0100)
committerAlan T. DeKok <aland@freeradius.org>
Mon, 21 Dec 2009 09:49:50 +0000 (10:49 +0100)
57 files changed:
debian/README.Debian
debian/README.rfc [new file with mode: 0644]
debian/README.source [new file with mode: 0644]
debian/TODO [deleted file]
debian/apache2.conf [new file with mode: 0644]
debian/changelog
debian/control
debian/copyright
debian/freeradius-common.dirs [new file with mode: 0644]
debian/freeradius-common.install [new file with mode: 0644]
debian/freeradius-common.manpages [moved from debian/freeradius.manpages with 100% similarity]
debian/freeradius-common.postinst [new file with mode: 0644]
debian/freeradius-common.postrm [new file with mode: 0644]
debian/freeradius-common.prerm [new file with mode: 0644]
debian/freeradius-dialupadmin.README.Debian
debian/freeradius-dialupadmin.docs
debian/freeradius-dialupadmin.examples
debian/freeradius-dialupadmin.install
debian/freeradius-iodbc.install
debian/freeradius-iodbc.postinst
debian/freeradius-krb5.install
debian/freeradius-krb5.lintian-overrides [new file with mode: 0644]
debian/freeradius-krb5.postinst
debian/freeradius-ldap.install
debian/freeradius-ldap.lintian-overrides [new file with mode: 0644]
debian/freeradius-ldap.postinst
debian/freeradius-mysql.install
debian/freeradius-mysql.postinst
debian/freeradius-mysql.prerm [new file with mode: 0644]
debian/freeradius-postgresql.install
debian/freeradius-postgresql.postinst
debian/freeradius-postgresql.prerm [new file with mode: 0644]
debian/freeradius-utils.install [new file with mode: 0644]
debian/freeradius-utils.lintian-overrides [new file with mode: 0644]
debian/freeradius.dirs
debian/freeradius.docs
debian/freeradius.examples
debian/freeradius.init
debian/freeradius.install
debian/freeradius.logrotate
debian/freeradius.postinst
debian/freeradius.postrm
debian/freeradius.preinst [new file with mode: 0644]
debian/freeradius.prerm
debian/freeradius.radiusd.pam
debian/libfreeradius-dev.install [new file with mode: 0644]
debian/libfreeradius2.install [new file with mode: 0644]
debian/libfreeradius2.lintian-overrides [new file with mode: 0644]
debian/patches/00list [deleted file]
debian/patches/dialupadmin-help.diff [moved from debian/patches/02-dialupadmin-help.dpatch with 85% similarity, mode: 0644]
debian/patches/gitignore.diff [new file with mode: 0644]
debian/patches/raddebug.man.diff [new file with mode: 0644]
debian/patches/radiusd-to-freeradius.diff [moved from debian/patches/01-radiusd-to-freeradius.dpatch with 89% similarity, mode: 0644]
debian/patches/rlm_perl.diff [new file with mode: 0644]
debian/patches/rlm_sql.libs.diff [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules

index eb0cf3f..e5ce82c 100644 (file)
@@ -1,20 +1,3 @@
-During conversion from radiusd-freeradius* packages to freeradius* packages,
-the directory for configuration has moved to /etc/freeradius from
-/etc/raddb. Since a number of things have changed in the way freeradius
-is configured this package does not automatically copy your old
-configuration; please do that manually.
-
-Also, the upstream supplied dictionaries are now in /usr/share/freeradius/.
-/etc/freeradius/dictionary is still the place for local dictionary
-additions. See /etc/freeradius/dictionary for details.
-
-If FreeRADIUS fails to start, without any error message, be sure that the
-directory specified for the pidfile in the configuration is correct. If
-it is incorrect, or not writeable by user freerad or group freerad, then
-FreeRADIUS will fail to start. The initscript supplied expects this to
-be /var/run/freeradius/freeradius.pid, and /var/run/freeradius/ is
-created by the maintainer scripts.
-
 Runlevel Changes
 ================
 In freeradius 1.1.5-1, we changed our update-rc.d call so that we start
diff --git a/debian/README.rfc b/debian/README.rfc
new file mode 100644 (file)
index 0000000..b3cbb53
--- /dev/null
@@ -0,0 +1,229 @@
+These are the relevant RFC's that normally ship with freeradius.  However,
+we have now decided that useful things like RFC's are not free enough, and
+so we can't ship them in Debian main.  They are all available from the
+original freeradius tarball, available at
+ftp://ftp.freeradius.org/pub/radius/
+and from
+http://www.rfc-editor.org/
+
+Sorry for the inconvenience.
+
+Stephen Gran <sgran@debian.org>
+
+draft-kamath-pppext-eap-mschapv2-00    Change-Password
+pppext-eap-sim-12      Re-Authentication
+pppext-eap-sim-12      EAP-Request/SIM/Start
+pppext-eap-sim-12      EAP-Response/SIM/Start
+pppext-eap-sim-12      EAP-Request/SIM/Challenge
+pppext-eap-sim-12      EAP-Response/SIM/Challenge
+pppext-eap-sim-12      EAP-Request/SIM/Re-authentication
+pppext-eap-sim-12      EAP-Response/SIM/Re-authentication
+pppext-eap-sim-12      EAP-Response/SIM/Client-Error
+pppext-eap-sim-12      EAP-Request/SIM/Notification
+pppext-eap-sim-12      EAP-Response/SIM/Notification
+pppext-eap-sim-12      Man-in-the-middle
+rfc1227        Request-ID
+rfc2284        One-Time
+rfc2548        MS-CHAP-Challenge
+rfc2548        MS-CHAP-Response
+rfc2548        MS-CHAP-Domain
+rfc2548        MS-CHAP-Error
+rfc2548        MS-CHAP-CPW-1
+rfc2548        MS-CHAP-CPW-2
+rfc2548        MS-CHAP-LM-Enc-PW
+rfc2548        MS-CHAP-NT-Enc-PW
+rfc2548        MS-CHAP2-Response
+rfc2548        MS-CHAP2-Success
+rfc2548        MS-CHAP2-CPW
+rfc2548        MS-CHAP-MPPE-Keys
+rfc2548        MS-MPPE-Send-Key
+rfc2548        MS-MPPE-Recv-Key
+rfc2548        MS-MPPE-Encryption-Policy
+rfc2548        MS-MPPE-Encryption-Types
+rfc2548        MS-BAP-Usage
+rfc2548        MS-Link-Utilization-Threshold
+rfc2548        MS-Link-Drop-Time-Limit
+rfc2548        MS-Old-ARAP-Password
+rfc2548        MS-New-ARAP-Password
+rfc2548        MS-ARAP-Password-Change-Reason
+rfc2548        MS-ARAP-Challenge
+rfc2548        MS-RAS-Vendor
+rfc2548        MS-RAS-Version
+rfc2548        MS-Filter
+rfc2548        MS-Acct-Auth-Type
+rfc2548        MS-Acct-EAP-Type
+rfc2548        MS-Primary-DNS-Server
+rfc2548        MS-Secondary-DNS-Server
+rfc2548        MS-Primary-NBNS-Server
+rfc2548        MS-Secondary-NBNS-Server
+rfc2809        Telephone-number
+rfc2809        User-Name
+rfc2865        Keep-Alives
+rfc2865        Access-Request
+rfc2865        Access-Accept
+rfc2865        Access-Reject
+rfc2865        Access-Challenge
+rfc2865        User-Password
+rfc2865        CHAP-Password
+rfc2865        NAS-IP-Address
+rfc2865        NAS-Port
+rfc2865        Service-Type
+rfc2865        Framed-Protocol
+rfc2865        Framed-IP-Address
+rfc2865        Framed-IP-Netmask
+rfc2865        Framed-Routing
+rfc2865        Filter-Id
+rfc2865        Framed-MTU
+rfc2865        Framed-Compression
+rfc2865        Login-IP-Host
+rfc2865        Login-Service
+rfc2865        Login-TCP-Port
+rfc2865        Reply-Message
+rfc2865        Callback-Number
+rfc2865        Callback-Id
+rfc2865        Framed-Route
+rfc2865        Framed-IPX-Network
+rfc2865        Vendor-Specific
+rfc2865        Session-Timeout
+rfc2865        Idle-Timeout
+rfc2865        Termination-Action
+rfc2865        Called-Station-Id
+rfc2865        Calling-Station-Id
+rfc2865        NAS-Identifier
+rfc2865        Proxy-State
+rfc2865        Login-LAT-Service
+rfc2865        Login-LAT-Node
+rfc2865        Login-LAT-Group
+rfc2865        Framed-AppleTalk-Link
+rfc2865        Framed-AppleTalk-Network
+rfc2865        Framed-AppleTalk-Zone
+rfc2865        CHAP-Challenge
+rfc2865        NAS-Port-Type
+rfc2865        Port-Limit
+rfc2865        Login-LAT-Port
+rfc2866        Accounting-Request
+rfc2866        Accounting-Response
+rfc2866        Acct-Status-Type
+rfc2866        Acct-Delay-Time
+rfc2866        Acct-Input-Octets
+rfc2866        Acct-Output-Octets
+rfc2866        Acct-Session-Id
+rfc2866        Acct-Authentic
+rfc2866        Acct-Session-Time
+rfc2866        Acct-Input-Packets
+rfc2866        Acct-Output-Packets
+rfc2866        Acct-Terminate-Cause
+rfc2866        Acct-Multi-Session-Id
+rfc2866        Acct-Link-Count
+rfc2867        Tunnel-Start
+rfc2867        Tunnel-Stop
+rfc2867        Tunnel-Reject
+rfc2867        Tunnel-Link-Start
+rfc2867        Tunnel-Link-Stop
+rfc2867        Tunnel-Link-Reject
+rfc2867        Acct-Tunnel-Connection
+rfc2867        Acct-Tunnel-Packets-Lost
+rfc2868        Tunnel-Type
+rfc2868        Tunnel-Medium-Type
+rfc2868        Tunnel-Client-Endpoint
+rfc2868        Tunnel-Server-Endpoint
+rfc2868        Tunnel-Password
+rfc2868        Tunnel-Private-Group-ID
+rfc2868        Tunnel-Assignment-ID
+rfc2868        Tunnel-Preference
+rfc2868        Tunnel-Client-Auth-ID
+rfc2868        Tunnel-Server-Auth-ID
+rfc2869        Acct-Input-Gigawords
+rfc2869        Acct-Output-Gigawords
+rfc2869        Event-Timestamp
+rfc2869        ARAP-Password
+rfc2869        ARAP-Features
+rfc2869        ARAP-Zone-Access
+rfc2869        ARAP-Security
+rfc2869        ARAP-Security-Data
+rfc2869        Password-Retry
+rfc2869        Connect-Info
+rfc2869        Configuration-Token
+rfc2869        EAP-Message
+rfc2869        Message-Authenticator
+rfc2869        ARAP-Challenge-Response
+rfc2869        Acct-Interim-Interval
+rfc2869        NAS-Port-Id
+rfc2869        Framed-Pool
+rfc2924        ITU-T
+rfc3162        NAS-IPv6-Address
+rfc3162        Framed-Interface-Id
+rfc3162        Framed-IPv6-Prefix
+rfc3162        Login-IPv6-Host
+rfc3162        Framed-IPv6-Route
+rfc3162        Framed-IPv6-Pool
+rfc3576        Change-of-Authorization
+rfc3576        Error-Cause
+rfc3580        Filter-ID
+rfc3748        Pass-Through
+rfc3748        Peer-to-Peer
+rfc3748        Man-in-the-Middle
+rfc4372        Chargeable-User-Identity
+rfc4590        Digest-Response
+rfc4590        Digest-Realm
+rfc4590        Digest-Nonce
+rfc4590        Digest-Response-Auth
+rfc4590        Digest-Nextnonce
+rfc4590        Digest-Method
+rfc4590        Digest-URI
+rfc4590        Digest-Qop
+rfc4590        Digest-Algorithm
+rfc4590        Digest-Entity-Body-Hash
+rfc4590        Digest-CNonce
+rfc4590        Digest-Nonce-Count
+rfc4590        Digest-Username
+rfc4590        Digest-Opaque
+rfc4590        Digest-Auth-Param
+rfc4590        Digest-AKA-Auts
+rfc4590        Digest-Domain
+rfc4590        Digest-Stale
+rfc4590        Digest-HA1
+rfc4590        SIP-AOR
+rfc4675        Egress-VLANID
+rfc4675        Ingress-Filters
+rfc4675        Egress-VLAN-Name
+rfc4675        User-Priority-Table
+rfc4679        Sub-attribute
+rfc4679        Agent-Circuit-Id
+rfc4679        Agent-Remote-Id
+rfc4679        Actual-Data-Rate-Upstream
+rfc4679        Actual-Data-Rate-Downstream
+rfc4679        Minimum-Data-Rate-Upstream
+rfc4679        Minimum-Data-Rate-Downstream
+rfc4679        Attainable-Data-Rate-Upstream
+rfc4679        Attainable-Data-Rate-Downstream
+rfc4679        Maximum-Data-Rate-Upstream
+rfc4679        Maximum-Data-Rate-Downstream
+rfc4679        Minimum-Data-Rate-Upstream-Low-Power
+rfc4679        Minimum-Data-Rate-Downstream-Low-Power
+rfc4679        Maximum-Interleaving-Delay-Upstream
+rfc4679        Actual-Interleaving-Delay-Upstream
+rfc4679        Maximum-Interleaving-Delay-Downstream
+rfc4679        Actual-Interleaving-Delay-Downstream
+rfc4679        Access-Loop-Encapsulation
+rfc4679        IWF-Session
+rfc4849        NAS-Filter-Rule
+rfc5080        Interim-Accounting-Interval
+rfc5080        Link-Local
+rfc5247        Lower-Layer
+rfc5247        Parent-Child
+rfc5247        Denial-of-Service
+rfc5281        EAP-TTLS
+rfc5281        MS-CHAP
+rfc5281        MS-CHAP-V2
+rfc5281        Session-Id
+rfc5281        Peer-Id
+rfc5281        Server-Id
+rfc5281        Negotiating-Down
+rfc5580        Operator-Name
+rfc5580        Location-Information
+rfc5580        Location-Data
+rfc5580        Basic-Location-Policy-Rules
+rfc5580        Extended-Location-Policy-Rules
+rfc5580        Location-Capable
+rfc5580        Requested-Location-Info
diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..936af61
--- /dev/null
@@ -0,0 +1,2 @@
+
+freeradius has a trivial quilt setup - see /usr/share/doc/quilt/README.source
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644 (file)
index 0d75b23..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-TODO list for the Debian package:
-
-26 Nov 2000 -- Chad Miller
-* Begin writing manpages for topics listed in the
-  debian/freeradius.undocumented file.
-
-09 July 2003 -- Paul Hampson
-* Debhelper usage check/best practice audit
-  (http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200303/msg00002.html)
-* See if it builds cleanly on Debian/stable.
diff --git a/debian/apache2.conf b/debian/apache2.conf
new file mode 100644 (file)
index 0000000..5f3480f
--- /dev/null
@@ -0,0 +1,36 @@
+Alias /freeradius-dialupadmin /usr/share/freeradius-dialupadmin/htdocs
+
+<Directory /usr/share/freeradius-dialupadmin/htdocs>
+  Options Indexes FollowSymLinks
+
+  <IfModule mod_php4.c>
+    php_flag register_globals off
+  </IfModule>
+  <IfModule mod_php5.c>
+    php_flag register_globals off
+  </IfModule>
+
+</Directory>
+
+# You may prefer a simple URL like http://dialupadmin.example.com
+#<VirtualHost 1.2.3.4>
+#  DocumentRoot /usr/share/freeradius-dialupadmin/htdocs
+#  ServerName dialupadmin.example.com
+#</VirtualHost>
+
+# redirect to https when available 
+#
+#  Note: There are multiple ways to do this, and which one is suitable for
+#  your site's configuration depends. Consult the apache documentation if
+#  you're unsure, as this example might not work everywhere.
+#
+#<IfModule mod_rewrite.c>
+#  <IfModule mod_ssl.c>
+#    <Location /freeradius-dialupadmin>
+#      RewriteEngine on
+#      RewriteCond %{HTTPS} !^on$ [NC]
+#      RewriteRule . https://%{HTTP_HOST}%{REQUEST_URI}  [L]
+#    </Location>
+#  </IfModule>
+#</IfModule>
+
index 5263bf3..b46a1b8 100644 (file)
-freeradius (2.1.8-0) unstable; urgency=medium
-
- -- Alan DeKok <aland@freeradius.org>  Mon, 1 Jan 1999 01:00:00 +0100
-
-freeradius (2.1.7-0) unstable; urgency=medium
-  * Full support for CoA and Disconnect packets as per RFC 3576 and RFC 5176.  Both receiving and proxying CoA is supported.
-  * Added "src_ipaddr" configuration to "home_server".  See proxy.conf for details.
-  * radsniff now accepts -I, to read from a filename instead of a device.
-  * radsniff also prints matching requests and any responses to those requests when '-r' is used.
-  * Added example of attr_filter for Access-Challenge packets
-  * Added support for udpfromto in DHCP code
-  * radmin can now selectively mark modules alive/dead.  See "set module state".
-  * Added customizable messages on login success/fail.  See msg_goodpass && msg_badpass in log{} section of radiusd.conf
-  * Document "chase_referrals" and "rebind" in raddb/modules/ldap
-  * Preliminary implementation of DHCP relay.
-  * Made thread pool section optional.  If it doesn't exist, the server will run single-threaded.
-  * Added sample radrelay.conf for people upgrading from 1.x
-  * Made proxying more stable by failing over, rather than rejecting the first request.  See "response_window" in proxy.conf
-  * Allow home_server_pools to exist without realms.
-  * Add dictionary.iea (closes bug #7)
-  * Added support for RFC 5580
-  * Added experimental sql_freetds module from Gabriel Blanchard.
-  * Updated dictionary.foundry
-  * Added sample configuration for MySQL cluster in raddb/sql/ndb.  See the README file for explanations.
-  * Fixed corner case where proxied packets could have extra character in User-Password attribute.  Fix from Niko Tyni.
-  * Extended size of "attribute" field in SQL to 64.
-  * Fixes to ruby module to be more careful about when it builds.
-  * Updated Perl module "configure" script to check for broken Perl installations.
-  * Fix "status_check = none".  It would still send packets in some cases.
-  * Set recursive flag on the proxy mutex, which enables safer cleanup on some platforms.
-  * Copy the EAP username verbatim, rather than escaping it.
-  * Update handling so that robust-proxy-accounting works when all home servers are down for extended periods of time.
-  * Look for DHCP option 53 anywhere in the packet, not just at the start.
-  * Fix processing of proxy fail handler with virtual servers.
-  * DHCP code now prints out correct src/dst IP addresses when sending packets.
-  * Removed requirement for DHCP to have clients
-  * Fixed handling of DHCP packets with message-type buried in the packet
-  * Fixed corner case with negation in unlang.
-  * Minor fixes to default MySQL & PostgreSQL schemas
-  * Suppress MSCHAP complaints in debugging mode.
-  * Fix SQL module for multiple instance, and possible crash on HUP
-  * Fix permissions for radius.log for sites that change user/group, but which don't create the file before starting radiusd.
-  * Fix double counting of packets when proxying
-  * Make %l work
-  * Fix pthread keys in rlm_perl
-  * Log reasons for EAP failure (closes bug #8)
-  * Load home servers and pools that aren't referenced from a realm.
-  * Handle return codes from virtual attributes in "unlang" (e.g. LDAP-Group).  This makes "!(expr)" work for them.
-  * Enable VMPS to see contents of virtual server again
-  * Fix WiMAX module to be consistent with examples.  (closes bug #10)
-  * Fixed crash with policies dependent on NAS-Port comparisons
-  * Allowed vendor IDs to be be higher than 32767.
-  * Fix crash on startup with certain regexes in "hints" file.
-  * Fix crash in attr_filter module when packets don't exist
-  * Allow detail file reader to be faster when "load_factor = 100"
-  * Add work-around for build failures with errors related to lt__PROGRAM__LTX_preloaded_symbols.  libltdl / libtool are horrible.
-  * Made ldap module "rebind" option aware of older, incompatible versions of OpenLDAP.
-  * Check value of Fall-Through in attr_filter module.
-
- -- Alan DeKok <aland@freeradius.org>  Mon, 14 Sep 2009 11:20:00 +0100
-
-freeradius (2.1.6-0) unstable; urgency=medium
-  * radclient exits with 0 on successful (accept / ack), and 1 otherwise (no response / reject)
-  * Added support for %{sql:UPDATE ..}, and insert/delete.  Patch from Arran Cudbard-Bell
-  * Added sample "do not respond" policy.  See raddb/policy.conf and raddb/sites-available/do_not_respond
-  * Cleanups to Suse spec file from Norbert Wegener
-  * New VSAs for Juniper from Bjorn Mork
-  * Include more RFC dictionaries in the default install
-  * More documentation for the WiMAX module
-  * Added "chase_referrals" and "rebind" configuration to rlm_ldap. This helps with Active Directory.  See raddb/modules/ldap
-  * Don't load pre/post-proxy if proxying is disabled.
-  * Added %{md5:...}, which returns MD5 hash in hex.
-  * Added configurable "retry_interval" and "poll_interval" for "detail" listeners.
-  * Added "delete_mppe_keys" configuration option to rlm_wimax.  Apparently some WiMAX clients misbehave when they see those keys.
-  * Added experimental rlm_ruby from http://github.com/Antti/freeradius-server/tree/master
-  * Add Tunnel attributes to ldap.attrmap
-  * Enable virtual servers to be reloaded on HUP.  For now, only the "authorize", "authenticate", etc. processing sections are reloaded.  Clients and "listen" sections are NOT reloaded.
-  * Updated "radwatch" script to be more robust.  See scripts/radwatch
-  * Added certificate compatibility notes in raddb/certs/README, for compatibility with different operating systems. (i.e. Windows)
-  * Minor changes to allow building without VQP.
-  * Minor fixes from John Center
-  * Fixed raddebug example
-  * Don't crash when deleting attributes via unlang
-  * Be friendlier to very fast clients
-  * Updated the "detail" listener so that it only polls once, and not many times in a row, leaking memory each time...
-  * Update comparison for Packet-Src-IP-Address (etc.) so that the operators other than '==' work.
-  * Did autoconf magic to work around weird libtool bug
-  * Make rlm_perl keep tags for tagged attributes in more situations
-  * Update UID checking for radmin
-  * Added "include_length" field for TTLS.  It's needed for RFC compliance, but not (apparently) for interoperability.
-
- -- Alan DeKok <aland@freeradius.org>  Mon, 18 May 2009 10:00:00 +0100
-
-freeradius (2.1.5-0) unstable; urgency=medium
-  * Release number skipped due to procedural issues.
-
- -- Alan DeKok <aland@freeradius.org>  Mon, 01 Jan 1970 9:48:00 +0100
-
-freeradius (2.1.4-0) unstable; urgency=medium
-  * Permit multiple "-e" in radmin.
-  * Add support for originating CoA-Request and Disconnect-Request. See raddb/sites-available/originate-coa.
-  * Added "lifetime" and "max_queries" to raddb/sql.conf. This helps address the problem of hung SQL sockets.
-  * Allow packets to be injected via radmin.  See "inject help" in radmin.
-  * Answer VMPS reconfirmation request.  Patch from Hermann Lauer.
-  * Sample logrotate script in scripts/logrotate.freeradius
-  * Add configurable poll interval for "detail" listeners
-  * New "raddebug" command.  This prints debugging information from a running server.  See "man raddebug.
-  * Add "require_message_authenticator" configuration to home_server configuration.  This makes the server add Message-Authenticator to all outgoing Access-Request packets.
-  * Added smsotp module, as contributed by Siemens.
-  * Enabled the administration socket in the default install. See raddb/sites-available/control-socket, and "man radmin"
-  * Handle duplicate clients, such as with replicated or load-balanced SQL servers and "readclients = yes"
-  * Clean up control sockets when they are closed, so that we don't leak memory.
-  * Define SUN_LEN for systems that don't have it.
-  * Correct some boundary conditions in the conditional checker ("if") in "unlang".  Bug noted by Arran Cudbard-Bell.
-  * Work around minor building issues in gmake.  This should only have affected developers.
-  * Change how we manage unprivileged user/group, so that we do not create control sockets owned by root.
-  * Fixed more minor issues found by Coverity.
-  * Allow raddb/certs/bootstrap to run when there is no "make" command installed.
-  * In radiusd.conf, run_dir depends on the name of the program, and isn't hard-coded to "..../radiusd"
-  * Check for EOF in more places in the "detail" file reader.
-  * Added Freeswitch dictionary.
-  * Chop ethernet frames in VMPS, rather than droppping packets.
-  * Fix EAP-TLS bug.  Patch from Arnaud Ebalard
-  * Don't lose string for regex-compares in the "users" file.
-  * Expose more functions in rlm_sql to rlm_sqlippool, which  helps on systems where RTLD_GLOBAL is off.
-  * Fix typos in MySQL schemas for ippools.
-  * Remove macro that was causing build issues on some platforms.
-  * Fixed issues with dead home servers.  Bug noted by Chris Moules.
-  * Fixed "access after free" with some dynamic clients.
-
- -- Alan DeKok <aland@freeradius.org>  Tue, 10 Mar 2009 9:48:00 +0100
-  
-freeradius (2.1.3-0) unstable; urgency=medium
-  * Allow running with "user=radiusd" and binding to secure sockets.
-  * Start sending Status-Server "are you alive" messages earlier, which helps with proxying multiple realms to a home server.
-  * Removed thread pool code from rlm_perl.  It's not necessary.
-  * Added example Perl configuration to raddb/modules/perl
-  * Force OpenSSL to support certificates with SHA256. This seems to be necessary for WiMAX certs.
-  * Fix Debian patch to allow it to build.
-  * Fix potential NULL dereference in debugging mode on certain platforms for TTLS and PEAP inner tunnels.
-  * Fix uninitialized memory in handling of vendor definitions
-  * Fix parsing of quoted (but non-string) attributes in the "users" file.
-  * Initialize uknown NAS IP to 255.255.255.255, rather than 0.0.0.0
-  * use SUN_LEN in control socket, to avoid truncation on some platforms.
-  * Correct internal handling of "debug condition" to prevent it from being over-written.
-  * Check return code of regcomp in "unlang", so that invalid regular expressions are caught rather than mishandled.
-  * Make rlm_sql use <ltdl.h>.  Addresses bug #610.
-  * Document list "type = status" better.  Closes bug #580.
-  * Set "default days" for certificates, because OpenSSL won't do it.  This closes bug #615.
-  * Reference correct list in example raddb/modules/ldap. Closes #596.
-  * Increase default schema size for Acct-Session-Id to 64. Closes #540.
-  * Fix use of temporary files in dialup-admin.  Closes #605 and addresses CVE-2008-4474.
-  * Addressed a number of minor issues found by Coverity.
-  * Added DHCP option 150 to the dictionary.  Closes #618.
-
- -- Alan DeKok <aland@freeradius.org>  Fri, 04 Dec 2008 17:40:00 +0100
-
-freeradius (2.1.2-0) unstable; urgency=medium
-  * Due to packaging issues. 2.1.2 has been pulled from the net.
- -- Alan DeKok <aland@freeradius.org>  Thu, 03 Dec 2008 10:47:00 +0100
-
-freeradius (2.1.1-0) unstable; urgency=medium
-  * Many more options and features in radmin.  See "man radmin" and raddb/sites-available/control-socket
-  * Many more commands available via the control socket.  Connect via "radmin", and type "help" for more information.
-  * Added dictionary.networkphysics and dictionary.lancom.
-  * Calculate WiMAX MIP keys, and added sample WiMAX SQL tables.
-  * Fixed bug that made radmin not work
-  * Fixed Suse && Debian package scripts
-  * Fixed issues with dynamic clients
-  * Fixed configure checks for -lreadline
-  * rlm_sqlippool no longer needs to be linked to rlm_sql.
-  * Add statistics for detail file listeners.  This closes bug #593.
-  * Fixed printing of some WiMAX attributes.
-  * Fix double free on exit() in rlm_attr_filter
-  * Fixed build issues on Solaris.
-  * Fixed fast session resumption for EAP-TLS
-  
- -- Alan DeKok <aland@freeradius.org>  Thu, 25 Sep 2008 11:03:00 +0100
-
-freeradius (2.1.0-0) unstable; urgency=medium
-
-  * Clients may now be defined dynamically, based on IP address.  See raddb/sites-available/dynamic-clients.
-  * SNMP support is now available through an experimental Perl script.  See scripts/snmp-proxy/README
-  * SNMP statistics are available through Status-Server packets.  See raddb/sites-available/status
-  * Added more Microsoft attributes from bug #568.
-  * The "linelog" module has more functionality and flexibility. See raddb/modules/linelog.
-  * The debugging output has been sanitized.  It should be much more readable.
-  * Debug logs can now be turned on/off while the server is running, for a user, group, realm, etc.  See the "log" section of radiusd.conf.
-  * Added support for WiMAX Forum attributes.  The dynamic keys are not yet calculated.  See share/dictionary.wimax
-  * Added session resumption for PEAP and TTLS.  See raddb/eap.conf, "cache" sub-section.
-  * Added "radmin" command-line tool for administering a running server.  See "man radmin" and raddb/sites-available/control-socket.
-  * Double escaping of '\\' in the "users" (and some other) files has been fixed.  If you have '\\' in the "users" file, your configuration WILL NEED TO BE CHECKED, AND FIXED!
-  * Parse "security" section in radiusd.conf.  This was accidentally deleted in 2.0.5.  Closes bug #566.
-  * Bind to interface before IP, which allows DHCP sockets to listen on "*" for multiple interfaces.
-  * Fix handling of giaddr in DHCP responses.
-  * Corrected parsing of status_check in home_server so that it works.
-  * Fix hints so that "Puser" works again.
-  * Removed length restrictions on attribute names in the dictionaries.
-  * Update socket code to avoid C compiler optimizations.
-
--- Alan DeKok <aland@freeradius.org>  Fri, 05 Sep 2008 13:20:01 +0100
-
-freeradius (2.0.5-0) unstable; urgency=medium
-  * Permit SQL authorize_reply_query to be empty.
-  * Allow setting response packet type in Post-Proxy-Type Fail handler.
-  * Added install-chown target to set correct permission and ownership make RADMIN=radmin RGROUP=radius install-chown
-  * Support for LDAP-Group and other dynamic comparison attributes in unlang.  Developed from a patch by Jason Alderfer.
-  * Added chroot support.  See radiusd.conf for comments.
-  * Allow clients of 0/0.  We do not recommend using this, though.
-  * Moved many module configurations into raddb/modules/*
-  * Allow proxying to virtual servers for accounting packets, too.
-  * Added "num fields" function to PostgreSQL client.
-  * Updated proxy fallback mechanism to validate fallback servers, and to process fallback requests in a child thread.
-  * rlm_realm returns "ok" for LOCAL realms, not "noop".
-  * Fixed some DHCP code handling.  The examples should now work.
-
- -- Alan DeKok <aland@freeradius.org>  Sat, 07 Jun 2008 17:17:00 +0100
-
-freeradius (2.0.4-0) unstable; urgency=medium
-  * Allow "virtual_server" in "realm" and "home_server" sections. See raddb/proxy.conf and raddb/sites-available/virtual.example.com.
-  * Allow "passwd" module to be listed in "accounting" and "post-auth".
-  * Added "fallback" to "home_server_pool" configuration, to handle the case of all home servers being dead.  See raddb/proxy.conf.
-  * Added sample text to raddb/sites-available/inner-tunnel which can simplify debugging of inner tunnel configurations.
-  * Added regular expression matching in realm names.  See raddb/proxy.conf for examples.
-  * Added simple DHCP server functionality.  For comments, see raddb/sites-available/dhcp.
-  * Added file globbing capabilities to detail file reader
-  * Added sample raddb/sites-available/robust-proxy-accounting
-  * Clients in SQL can now refer to a virtual server. Patch from Michael Bretterklieber.
-  * Added some examples of creating RADIUS administrator in SQL, and assigning appropriate access rights.
-  * Install all files in raddb/sites-available
-  * Allow non-threaded builds.
-  * Don't treat '0x' as special for known attributes that are not of type "octets".
-  * Fix log error in rlm_pap.
-  * Remove documentation about non-existent functionality.
-  * Updated warning messages in debug output.
-  * Fix handling of timeouts in rlm_ldap that affected 64-bit systems. This fix was supposed to go into 2.0.3, but did not make it.
-  * Fix event handling in debug mode for failed proxy requests.
-  * Fix memleak in fifos.  Closes #537.
-  * Fix memleak on blocked threads.  Closes #538.
-  * Perform additional checks on NULL realms.  Closes #541.
-  * Fix handling of "clients" in "listen" section.
-  * When detail file cannot process a packet, sleep for longer to let the rest of the server do something.
-  * Add missing table to raddb/sql/mssql/schema.sql.  Closes #545.
-  * Updated rlm_sql_postgresql to build with PostgreSQL 7.x.  Closes #533.
-  * Fix "postauth" of rlm_ldap to look for LDAP-UserDn in the correct place.
-  * Update rlm_attr_filter for some corner cases.  Closes #543.
-  * Fixed memory leak in libfreeradius event handler.
-  * In the SQL Accounting on/off queries, remove the restriction that the session time had to be zero.
-
- -- Alan DeKok <aland@freeradius.org>  Wed, 30 Apr 2008 7:32:00 +0100
-
-freeradius (2.0.3-0) unstable; urgency=medium
-  * Updated raddb/certs/ca.cnf with extensions to allow ca.der to be imported as a CA on Symbian and Windows Mobile devices. Closes bug #524
-  * Enable multiple matches in "hints" via Fall-Through = Yes. Closes bug #477
-  * Added preliminary SQLite driver, contibuted by Apple. Untested, with no sample configuration.  This address bug #470.
-  * Updated logging sub-system so that log messages from libfreeradius can go to the log file, and not stdout.
-  * Added dictionary.rfc5176
-  * EAP module now checks for instance name, and uses that for authentication.  This avoids the need to set Auth-Type when there are multiple instances of the EAP module.
-  * Corrected typos in rlm_dbm.  Closes bugs #521 and #522.
-  * Detail file "listen" sections now work much better.
-  * Don't allow old "log_*" to over-ride new format.  Closes bug #525
-  * Initialize allocated memory in Oracle SQL driver.  This fixes occasional crashes on some systems.  Closes bug #518
-  * Call correct function in rlm_protocol_filter.  This enables the module to build.  Closes bug #512.
-  * Added deprecated flag to build for rlm_krb5.  This allows it to run on 64-bit systems.  Closes bug #491
-  * Corrected error message when parsing invalid configurations so it doesn't crash.  Closes bug #527
-  * Fix handling of timeouts in rlm_ldap that affected 64-bit systems.
-  * Handle $INCLUDE's in "instantiate" section.  Closes #528.
-
- -- Alan DeKok <aland@freeradius.org>  Thu, 17 Mar 2008 10:00:00 +0100
-
-freeradius (2.0.2-0) unstable; urgency=medium
-  * Added notes on how to debug the server in radiusd.conf
-  * Moved all "log_*" in radiusd.conf to log{} section.
-  * Added ca.der target in raddb/certs/Makefile.
-  * Added ability send raw attributes via "Raw-Attribute = 0x0102..."
-  * Permit "unlang" policies inside of Auth-Type{} sub-sections.
-  * "listen" sections can now have "type = proxy"
-  * Fixed reading of "detail" files.
-  * Allow inner EAP tunneled sessions to be proxied.
-  * Corrected MySQL schemas
-  * syslog now works in log{} section.
-  * Corrected typo in raddb/certs/client.cnf
-  * Updated raddb/sites-available/proxy-inner-tunnel.
-  * Ignore zero-length attributes in received packets.
-  * Correct memcpy when dealing with unknown attributes.
-  * Corrected debugging messages in attr_rewrite.
-  * Corrected generation of State attribute in EAP.
-  * Fall back to DEFAULT realm if no realm was found.
-  * Updated example raddb/sites-available/proxy-inner-tunnel
-  * Corrected behavior of attr_filter to match documentation.
-
- -- Alan DeKok <aland@freeradius.org>  Thu, 14 Feb 2008 12:08:06 +0100
-
-freeradius (2.0.1-0) unstable; urgency=low
-  * Improve "unlang".  See "man unlang"
-  * update acct_module
-  * fix parsing of syslog logging
-  * Minor fixes over 2.0.0
-
- -- Alan DeKok <aland@freeradius.org>  Tue, 22 Jan 2008 14:25:44 +0100
-
-freeradius (2.0.0-0) unstable; urgency=low
+freeradius (2.1.7+git) experimental; urgency=low
 
-  * New upstream release.
-  * Upgrade debhelper compatibility to version 5. This breaks the build
-    on Sarge, which is no longer in stable.
-  * Rewrite large parts of debian/rules based on the changes from the
-    downstream debian package. (use dpatches and debhelper files where
-    possible)
-  * New initscript that uses the LSB functions instead of calling directly
-    start-stop-daemon.
-  * Create default certificates in postinst to enable the EAP modules (tls,
-    ttls and peap) when the server starts for the first time.
-  * Update Standards-Version to 3.7.3.
+  * Unreleased.
 
- -- Nicolas Baradakis <nbk@sitadelle.com>  Sat,  4 Jan 2008 20:15:42 +0100
+ -- Josip Rodin <joy-packages@debian.org>  Fri, 27 Nov 2009 16:03:31 +0100
 
-freeradius (1.1.7-0) unstable; urgency=low
+freeradius (2.1.7+dfsg-2) unstable; urgency=low
 
-  * New upstream release.
+  * Ship radmin and raddebug in the freeradius package.
+  * Correct section number inside raddebug(8) so it doesn't get misplaced.
 
- -- Alan DeKok <aland@freeradius.org>  Tue, 26 Jun 2007 09:52:41 +0100
+ -- Josip Rodin <joy-packages@debian.org>  Tue, 24 Nov 2009 15:29:59 +0100
 
-freeradius (1.1.6-0) unstable; urgency=low
+freeradius (2.1.7+dfsg-1) unstable; urgency=low
 
-  * New upstream release.
+  * Adopting the package, closes: #536623.
+  * New upstream version, closes: #513484.
+    + Fixes the blooper in unlang evaluation logic, closes: #526175.
+  * Used quilt (and added README.source), and moved upstream file patching
+    into debian/patches/. The source is no longer in collab-maint git
+    (to make it simpler for me to finally get this out the door), but
+    kept the .gitignore should we need that again.
+  * Dropped the dialup_admin/bin/backup_radacct patch (integrated upstream).
+  * Dropped the raddb/Makefile patch (problem no longer exists upstream).
+  * Dropped the lib/packet.c lib/radius.c main/listen.c patches (was from
+    upstream 2.0.5 anyway).
+  * Dropped references to otp.conf, it no longer exists upstream.
+    Keep removing the conffile statoverride in prerm.
+  * Dropped references to snmp.conf, it no longer exists upstream.
+    Keep removing the conffile statoverride in prerm.
+  * Ship /etc/freeradius/modules/* in the freeradius package.
+  * Stop shipping sites-enabled symlinks in the package and instead create
+    them only on initial install, thanks to Matej Vela, closes: #533396.
+  * Add export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" to the init script
+    at the request of John Morrissey, closes: #550143.
+  * Stop installing /var/run/freeradius in the package to silence Lintian.
+    The init script already recreates it at will.
+  * Remove executable bit from example.pl to silence Lintian.
 
- -- Alan DeKok <aland@freeradius.org>  Mon, 26 Mar 2007 14:57:03 +0100
+ -- Josip Rodin <joy-packages@debian.org>  Mon, 23 Nov 2009 03:57:37 +0100
 
-freeradius (1.1.5-0) unstable; urgency=low
+freeradius (2.0.4+dfsg-7) unstable; urgency=low
 
-  * New upstream release.
+  * Ignore rmdir failure on clean (closes: #545932)
+  * Do a better job of catching errors in the init script (closes: #533390)
+  * Init headers fixup (closes: #541882)
+  * Clean up some logs so dpkg can successfully rmdir (closes: #530727)
 
- -- Nicolas Baradakis <nbk@sitadelle.com>  Tue,  6 Mar 2007 23:52:55 +0100
+ -- Stephen Gran <sgran@debian.org>  Sun, 13 Sep 2009 19:33:12 +0100
 
-freeradius (1.1.3-0) unstable; urgency=low
+freeradius (2.0.4+dfsg-6) unstable; urgency=low
 
-  * New upstream release.
-  * Delete dpatch merged in mainstream CVS:
-    - 01-actually_check_for_unset_password
-  * Remove irrelevant dpatch after autotools upgrade:
-    - 13_a_libtool_to_call_your_own
-  * Update debian/rules because of autotools upgrade, too.
-  * Fix errors in initscript when trying to reload even if the server
-    isn't running.
+  * Fix unsafe use of tempfile (closes: #496389)
 
- -- Nicolas Baradakis <nbk@sitadelle.com>  Mon, 10 Jul 2006 14:06:04 +0200
+ -- Stephen Gran <sgran@debian.org>  Mon, 25 Aug 2008 14:18:48 +0100
 
-freeradius (1.1.2-0) unstable; urgency=low
+freeradius (2.0.4+dfsg-5) unstable; urgency=low
 
-  * New upstream release.
-  * Update dpatch for 1.1.2:
-    - 13_a_libtool14_to_call_your_own
+  [ Mark Hymers ]
+  * Cherry pick commit from 2.0.5 which fixes port binding issues.
+    Closes: #489773.
 
- -- Nicolas Baradakis <nbk@sitadelle.com>  Sun, 21 May 2006 19:20:03 +0200
+  [ Stephen Gran ]
+  * add PERL_SYS_INIT3 and PERL_SYS_TERM calls to rlm_perl. (closes: #495073)
+  * Make the SQL modules link against rlm_sql.so in the most horrific
+    (and only) way possible.  (closes: #448699)
 
-freeradius (1.1.1-0) unstable; urgency=low
+ -- Stephen Gran <sgran@debian.org>  Thu, 14 Aug 2008 19:15:30 +0100
 
-  * New upstream release.
-  * Delete dpatches merged in mainstream CVS:
-    - 01_NET-SNMP_build_support
-    - 02_document_actual_shared_secret_maximum_length
-    - 12_more_dialup_admin_various_fixes
-  * Remove irrelevant dpatch after rlm_eap changes in CVS:
-    - 06_libtool14_vs_rlm_eap_tls
-  * Features that break compatibility with Sarge have not been merged:
-    - debhelper V5 support
-    - lsb-init functions
-
- -- Nicolas Baradakis <nbk@sitadelle.com>  Sun, 12 Feb 2006 16:29:20 +0100
+freeradius (2.0.4+dfsg-4) unstable; urgency=low
+
+  * Create links from sites-enabled to sites-available for the files that
+    upstream enables by default (closes: #483914)
+
+ -- Stephen Gran <sgran@debian.org>  Sun, 01 Jun 2008 12:24:35 +0100
+
+freeradius (2.0.4+dfsg-3) unstable; urgency=low
+
+  * brown paper bag release
+  * Really actually do the statoverride I thought we were doing with -2
+    (closes: #482380)
+
+ -- Stephen Gran <sgran@debian.org>  Thu, 22 May 2008 11:18:12 +0100
+
+freeradius (2.0.4+dfsg-2) unstable; urgency=low
+
+  * Install /var/log/freeradius 0750 so that people writing their passwords to
+    logfiles don't accidentally leak them without noticing (closes: #482085)
+
+ -- Stephen Gran <sgran@debian.org>  Tue, 20 May 2008 19:38:27 +0100
+
+freeradius (2.0.4+dfsg-1) unstable; urgency=low
+
+  * Ok, actually remove all the cruft in debian/ shipped by upstream.  This
+    means repacking the tarball and all that, but it also means dpkg-source
+    won't get the chance to ignore removed files, resulting in files
+    reappearing, but not locally (closes: #481406)
+  * Also remove config.{cache,log} in clean target - damn you gitignore
+
+ -- Stephen Gran <sgran@debian.org>  Mon, 19 May 2008 03:55:55 +0100
+
+freeradius (2.0.4-3) unstable; urgency=low
+
+  * I have no god damn idea why the buildds are adding manpages to the wrong
+    binary.  Reuploading with DH_VERBOSE=1 to see if we can find it.  We
+    certainly can't reproduce it in our local builds, even calling the same
+    targets in the same order as the buildds.
+
+ -- Stephen Gran <sgran@debian.org>  Mon, 19 May 2008 00:17:06 +0100
+
+freeradius (2.0.4-2) unstable; urgency=low
+
+  * freeradius-{common,utils} needs to Conflict: with other radius
+    implementations that share files (closes: #480682)
+
+ -- Stephen Gran <sgran@debian.org>  Sun, 11 May 2008 18:41:45 +0100
+
+freeradius (2.0.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Make all directories in /etc/freeradius group +x (closes: #479835)
+
+ -- Stephen Gran <sgran@debian.org>  Fri, 09 May 2008 12:58:55 +0100
+
+freeradius (2.0.3-1) unstable; urgency=low
+
+  [ Mark Hymers ]
+  * New upstream release
+  * Bump Build-Dep on debhelper to 6.0.7 as we use dh_lintian
+  * Delete lots of obsolete conffiles
+
+  [ Stephen Gran ]
+  * Create a -common package for some extra file that the -utils package
+    needs.  Also stuff in manpages and other arch all files to reduce the size
+    of the unnecessarily repeated stuff in the archive
+  * Change chown/chmod calls to dpkg-statoverride
+
+ -- Mark Hymers <mhy@debian.org>  Sat, 03 May 2008 17:07:42 +0100
+
+freeradius (2.0.2-1) unstable; urgency=low
+
+  * Yet another new upstream version (closes: #465475)
+  * Cleanup manpages
+  * Add lintian overrides for rpath - this is intentional
+  * Packaging is now being done in git, we're dropping dpatch
+  * Split out client utilities (closes: #470977) - this means we also need to
+    split the library so the two binary packages can use it
+  * Major package rework
+
+ -- Stephen Gran <sgran@debian.org>  Sun, 16 Mar 2008 22:58:16 +0000
+
+freeradius (2.0.0-1) unstable; urgency=low
+
+  * New upstream version
+  * Patches:
+    - freshen 02-radiusd-to-freeradius
+    - disable 03-dialupadmin-help until it's reworked properly
+
+ -- Stephen Gran <sgran@debian.org>  Thu, 10 Jan 2008 23:05:50 +0000
+
+freeradius (1.1.7-1) unstable; urgency=low
+
+  * New upstream version
+  * Update debian/copyright to reflect reality:
+    - package is GPL v2 only, so refer to the correct file in common-licenses
+    - Remove explanation of wy postgres and snmp modules can't be shipped,
+      since we do ship them.
+  * Remove 04-configure-openssl.dpatch, --without-openssl applied upstream
+
+ -- Stephen Gran <sgran@debian.org>  Thu, 09 Aug 2007 10:09:20 +0100
+
+freeradius (1.1.6-4) unstable; urgency=low
+
+  The "Give me GPLv2 compatibility or give me FTBFS" release
+  * Fix rlm_krb5 not to link with openssl unless it actually needs to
+  * debian/rules: move dependency on patch target to config.status
+  * debian/rules: FTBFS if a package accidentally directly links to openssl
+
+ -- Stephen Gran <sgran@debian.org>  Wed, 04 Jul 2007 17:08:45 +0100
+
+freeradius (1.1.6-3) unstable; urgency=low
+
+  * Change freeradius-dbg to Priority: extra.
+  * After discussions with one of the ftp-assistants, we can ship
+    freeradius-postgresql in main.  Yey!  (Closes: #264649, #382329)
+
+ -- Mark Hymers <mhy@debian.org>  Thu, 21 Jun 2007 13:32:09 +0100
+
+freeradius (1.1.6-2) unstable; urgency=low
+
+  [ Mark Hymers ]
+  * Add freeradius-dbg package.
+
+  [ Stephen Gran ]
+  * Update debian/control for php5 (dialupadmin) (closes: #424788, #412701)
+
+ -- Stephen Gran <sgran@debian.org>  Thu, 31 May 2007 02:47:02 +0100
+
+freeradius (1.1.6-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #420003. 
+
+ -- Mark Hymers <mhy@debian.org>  Thu, 19 Apr 2007 15:14:05 +0100
+
+freeradius (1.1.5-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #415980
+  * Remove 01-fix-proxy.dpatch as it was a backport from upstream.
+  * otppasswd.sample is no longer provided so make sure we remove the
+    conffile properly in preinst.
+  * Update my email address and remove Paul from Uploaders.  Thanks to him for
+    previously maintaining the package.
+  * Change so that we start at S50 and stop at K19 so that we start after
+    services we depend on and stop before them.  Closes: #408665.
+    Note that is only for new installs.
+
+ -- Mark Hymers <mhy@debian.org>  Fri, 13 Apr 2007 13:14:08 +0100
+
+freeradius (1.1.3-3) unstable; urgency=medium
+
+  * Fix POSIX compliance problem in init script.  Closes: #403384. 
+
+ -- Mark Hymers <mark@hymers.org.uk>  Sat, 16 Dec 2006 20:45:11 +0000
+
+freeradius (1.1.3-2) unstable; urgency=low
+
+  [ Stephen Gran ]
+  * Check for existence of pidfile in initscript.
+  * Clean some old cruft from debian/rules
+  * Write dialup_admin/Makefile
+  * Make binNMU safe
+  * Some lsb init headers
+
+  [ Mark Hymers ]
+  * Merge upstream patch to deal with proxy port settings.  Closes: #388024.
+  * Rewrite large parts of the Debian build system.
+
+ -- Stephen Gran <sgran@debian.org>  Sat,  7 Oct 2006 21:08:35 +0100
+
+freeradius (1.1.3-1) unstable; urgency=low
+
+  [ Stephen Gran ]
+  * Add and rework ubuntu /var/run/tmpfs patch
+  * Add LSB init script headers
+  * Actually trap errors in init script, how about?
+
+  [ Mark Hymers ]
+  * New upstream version.
+  * New version of autotools in 1.1.3. Closes: #380204
+  * Remove previous patches merged upstream:
+    - 01-actually_check_for_unset_password.dpatch
+  * Only do user creation, group addition, chmod and chown stuff in postinst
+    on an initial install to avoid clobbering local changes.
+
+ -- Mark Hymers <mark@hymers.org.uk>  Wed, 23 Aug 2006 14:48:57 +0100
+
+freeradius (1.1.2-2) unstable; urgency=low
+
+  [ Stephen Gran ]
+  * Acknowledge my previous NMU's (closes: #351732, #359042)
+  * Init scripts overhaul:
+    - now use reload on upgrade of modules
+    - replace sleep statements with --retry, as time based tests are
+      fragile
+    - no longer exit with an error if stop fails because the
+      daemon isn't running (closes: #374670, #351735)
+    - stop using command -v in /bin/sh scripts
+  * General maintainer script overhaul:
+    - Don't rm -rf something in /etc (ouch)
+    - Use chown -R instead of 'find .. -exec'
+    - should not need to manually remove the init script on purge (it's a dpkg
+      managed conffile)
+    - Only do user management stuff if user is missing.  No point rerunning it
+      every upgrade.
+    - Install /etc/freeradius/dictionary with relaxed permissions, but never
+      touch it again (closes: #334299)
+    - switch to debhelper files where possible.  I like an easy to read
+      Makefile.
+  * Arg.  Move README.rfc to the freeradius package where it belongs.
+
+  [ Mark Hymers ]
+  * Document building SSL/PostgreSQL modules in debian/rules, add
+    control.postgresql to make it more convenient.  Tested on AMD64 using
+    system libtool.
+
+ -- Stephen Gran <sgran@debian.org>  Sun, 25 Jun 2006 23:06:16 +0100
+
+freeradius (1.1.2-1) unstable; urgency=low
+
+  [ Mark Hymers ]
+  * New maintainers
+  * New upstream version.
+  * Remove previous patches merged upstream:
+    - 01_NET-SNMP_build_support.dpatch
+    - 02_document_actual_shared_secret_maximum_length.dpatch
+    - 12_more_dialup_admin_various_fixes.dpatch
+    - 14_broken_parse.dpatch
+    - 15_CVE-2006-1354.dpatch
+  * Use --with-system-libtool during configure.  Add B-D: on libtool
+    Removes obsolete dpatches:
+    - 06_libtool14_vs_rlm_eap_tls.dpatch
+    - 13_a_libtool_to_call_your_own.dpatch
+  * Remove freeradius.undocumented as we don't install links to
+    undocumented(7) anymore (not recommended since policy 3.5.8.0)
+
+  [ Stephen Gran ]
+  * Update to Standards Version 3.7.2 (no changes)
+  * Remove doc/rfc/ to make -legal happy (closes: #365192)
+    - this means repacked tarball.  See README.rfc for details
+  * Test for unset variable, rather than empty variable in clean_radacct,
+    monthly_tot_stats and truncate_radacct (closes: #374053)
+
+ -- Mark Hymers <mark@hymers.org.uk>  Sat, 17 Jun 2006 16:05:19 +0100
+
+freeradius (1.1.0-1.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * [ CVE-2006-1354 ]:
+    src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c:
+    Due to insufficient input validation it is possible for a remote
+    attacker to bypass authentication or cause a denial of service.
+    (closes: #359042)
+
+ -- Stephen Gran <sgran@debian.org>  Wed, 17 May 2006 11:22:28 -0500
+
+freeradius (1.1.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Upstream patch to fix parsing config file (closes: #351732)
+    Fixes: fails to start on amd64 (error in dictionary parsing code)
+
+ -- Stephen Gran <sgran@debian.org>  Sat,  1 Apr 2006 11:07:55 +0100
 
 freeradius (1.1.0-1) unstable; urgency=low
   * ReDebianise upstream tarball:
index 51190dc..a85a84a 100644 (file)
 Source: freeradius
-Build-Depends: debhelper (>= 5), dpatch (>= 2), dpkg-dev (>= 1.13.19), autotools-dev, libtool (>= 1.5), libltdl3-dev, libpam0g-dev, libmysqlclient15-dev | libmysqlclient-dev, libgdbm-dev, libldap2-dev, libsasl2-dev, libiodbc2-dev, libkrb5-dev, libperl-dev, libpcap-dev, python-dev, snmp, libsnmp9-dev | libsnmp-dev, libpq-dev, libssl-dev
+Build-Depends: debhelper (>= 6.0.7),
+ quilt,
+ dpkg-dev (>= 1.13.19),
+ autotools-dev,
+ libtool,
+ libltdl3-dev,
+ libpam0g-dev,
+ libmysqlclient-dev,
+ libgdbm-dev,
+ libldap2-dev,
+ libsasl2-dev,
+ libiodbc2-dev,
+ libkrb5-dev,
+ libperl-dev,
+ libpcap-dev,
+ python-dev,
+ libsnmp-dev,
+ libpq-dev
 Section: net
 Priority: optional
-Maintainer: Nicolas Baradakis <nbk@sitadelle.com>
-Standards-Version: 3.7.3.0
+Maintainer: Josip Rodin <joy-packages@debian.org>
+Uploaders: Stephen Gran <sgran@debian.org>, Mark Hymers <mhy@debian.org>
+Standards-Version: 3.8.3
+Homepage: http://www.freeradius.org/
 
 Package: freeradius
 Architecture: any
-Depends: lsb-base (>= 3.1-23.2), adduser, openssl, ${shlibs:Depends}
+Depends: lsb-base (>= 3.1-23.2), ${shlibs:Depends}, freeradius-common, libfreeradius2 (= ${binary:Version})
 Provides: radius-server
+Recommends: freeradius-utils
 Suggests: freeradius-ldap, freeradius-postgresql, freeradius-mysql, freeradius-krb5
 Description: a high-performance and highly configurable RADIUS server
- FreeRADIUS is the world's most popular RADIUS Server. It is fast, flexible,
- configurable, and supports more authentication protocols than most commercial
- servers. It includes support for SQL, LDAP, RADIUS Proxying, failover, load
- balancing, and nearly 100 vendor dictionary files.
+ FreeRADIUS is a high-performance RADIUS server with support for:
+  - many vendor-specific attributes
+  - proxying and replicating requests by any criteria
+  - authentication on system passwd, SQL, Kerberos, LDAP, users file, or PAM
+  - multiple DEFAULT configurations
+  - regexp matching in string attributes
+ and lots more.
+
+Package: freeradius-common
+Depends: adduser
+Architecture: all
+Conflicts: radiusd-livingston, xtradius, yardradius
+Replaces: freeradius (<< 2.0)
+Description: FreeRADIUS common files
+ This package contains common files used by several of the other packages from
+ the FreeRADIUS project.
+
+Package: freeradius-utils
+Architecture: any
+Replaces: freeradius (<< 2.0)
+Conflicts: radiusd-livingston, yardradius
+Depends: ${shlibs:Depends}, freeradius-common, libfreeradius2 (= ${binary:Version})
+Recommends: libdbi-perl
+Description: FreeRADIUS client utilities
+ This package contains various client programs and utilities from
+ the FreeRADIUS Server project, including:
+  - radclient
+  - radeapclient
+  - radlast
+  - radsniff
+  - radsqlrelay
+  - radtest
+  - radwho
+  - radzap
+  - rlm_dbm_cat
+  - rlm_dbm_parser
+  - rlm_ippool_tool
+  - smbencrypt
+
+Package: libfreeradius2
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: FreeRADIUS shared library
+ The FreeRADIUS projects' libfreeradius-radius and libfreeradius-eap, used by
+ the FreeRADIUS server and some of the utilities.
+
+Package: libfreeradius-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, libfreeradius2 (= ${binary:Version})
+Description: FreeRADIUS shared library development files
+ The FreeRADIUS projects' libfreeradius-radius and libfreeradius-eap, used by
+ the FreeRADIUS server and some of the utilities.
  .
- Web site: http://www.freeradius.org/
+ This package contains the development headers and static library version.
 
 Package: freeradius-krb5
 Architecture: any
-Depends: freeradius (= ${source:Version}), ${shlibs:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}
 Description: kerberos module for FreeRADIUS server
  The FreeRADIUS server can use Kerberos to authenticate users, and this module
  is necessary for that.
 
 Package: freeradius-ldap
 Architecture: any
-Depends: freeradius (= ${source:Version}), ${shlibs:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}
 Description: LDAP module for FreeRADIUS server
  The FreeRADIUS server can use LDAP to authenticate users, and this module
  is necessary for that.
 
 Package: freeradius-postgresql
 Architecture: any
-Depends: freeradius (= ${source:Version}), ${shlibs:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}
 Description: PostgreSQL module for FreeRADIUS server
  The FreeRADIUS server can use PostgreSQL to authenticate users and do
  accounting, and this module is necessary for that.
 
 Package: freeradius-mysql
 Architecture: any
-Depends: freeradius (= ${source:Version}), ${shlibs:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}
 Description: MySQL module for FreeRADIUS server
  The FreeRADIUS server can use MySQL to authenticate users and do accounting,
  and this module is necessary for that.
 
 Package: freeradius-iodbc
 Architecture: any
-Depends: freeradius (= ${source:Version}), ${shlibs:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}
 Description: iODBC module for FreeRADIUS server
  The FreeRADIUS server can use iODBC to access databases to authenticate users
  and do accounting, and this module is necessary for that.
 
 Package: freeradius-dialupadmin
 Architecture: all
-Depends: php5 | php5-cgi
-Recommends: ${perl:Depends}
-Suggests: apache2-mpm-prefork | httpd, php5-mysql | php5-pgsql, libdate-manip-perl
+Depends: php5 | libapache2-mod-php5 | php5-cgi, apache2-mpm-prefork | httpd, ${perl:Depends}
+Suggests: php5-mysql | php5-pgsql, php5-ldap, libdate-manip-perl
 Description: set of PHP scripts for administering a FreeRADIUS server
  These scripts provide a web-based interface for administering a FreeRADIUS
  server which stores authentication information in either SQL or LDAP.
 
 Package: freeradius-dbg
 Architecture: any
+Section: debug
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: debug symbols for the FreeRADIUS packages
  FreeRADIUS is a modular, high performance and feature-rich RADIUS server.
  This package contains the detached debugging symbols for the Debian FreeRADIUS
index 8c3fea5..d4eab2c 100644 (file)
@@ -2,13 +2,65 @@ This package was debianized by Chad Miller <cmiller@debian.org> on
 Fri, 24 Nov 2000 16:25:57 -0500.
 The packaging was rearranged by Paul Hampson <Paul.Hampson@anu.edu.au> on
 Sun,  4 May 2003 03:51:20 +1000
+The packaging was revamped by Stephen Gran <sgran@debian.org> on
+Sat, 15 Mar 2008 16:26:51 +0000.
 
 It was downloaded from http://www.freeradius.org/
 
-Copyright (C) 2000-2007 The FreeRADIUS Server Project
+  FreeRADIUS is the result of the work done by a large number of
+people.  The major contributors are listed here.
+
+Miquel van Smoorenburg <miquels@cistron.nl>
+       Wrote the original Cistron server, and started the FreeRADIUS
+       source tree.
+
+Alan DeKok <aland@ox.org>
+       Registered and maintains www.freeradius.org.  Wrote the module
+       code.  Made the server threaded.  Maintains the autoconf and
+       libtool scripts for the server.
+
+Alan Curry <pacman@world.std.com>
+       Contributed many patches for proxying, replication, realm
+       support.
+
+Mike Machado (mike@innercite.com) 
+       Author of the SQL module.
+
+Adrian Pavlykevych <pam@polynet.lviv.ua>
+       LDAP module.
+
+Jeff Carneal, Apex Internet Services, Inc.
+       Wrote the caching support for the Unix module.
+
+miguel a.l. paraz <map@iphil.net>
+       Wrote the original code which was the basis for the PAM module.
+
+Jochen Friedrich <jochen+freeradius-devel@scram.de>
+       SMUX / SNMP support.
+
+Nathan Neulinger <nneul@umr.edu>
+       Kerberos authentication module.
+
+Brandon Lee Poyner <bpoyner@thebiz.net>
+       Netscape-MTA-MD5 authentication module.
+
+Chris Parker <cparker@starnetusa.net>
+       Configuration parser enhancments, 'rlm_attr_filter' module, and
+       proxy enhancements.
+
+Kostas Kalevras <kkalev@noc.ntua.gr>
+       Contributed the 'dialup_admin' PHP server administration code.
+
+Chris Brotsos <cbrotsos@starnetusa.net>
+       Memory allocation debugging and proxy enhancements.
+
+Copyright: 
+
+Copyright (C) 2000-2008 The FreeRADIUS Server Project
 Copyright (C) 1997-1999 Cistron Internet Services B.V.
 
---
+License:
+
 Except for /usr/lib/freeradius/libradius*, this package is licensed
 under the GNU GPL version 2.
 
@@ -39,4 +91,6 @@ modules cannot be enabled as they directly depend on OpenSSL:
 rlm_eap_peap
 rlm_eap_tls
 rlm_eap_ttls
-rlm_otp
+
+The Debian packaging is (C) 2008, Stephen Gran <sgran@debian.org> and
+is licensed under the GPL, see /usr/share/common-licenses/GPL.
diff --git a/debian/freeradius-common.dirs b/debian/freeradius-common.dirs
new file mode 100644 (file)
index 0000000..ee1bb6d
--- /dev/null
@@ -0,0 +1,2 @@
+etc/freeradius
+usr/share/freeradius
diff --git a/debian/freeradius-common.install b/debian/freeradius-common.install
new file mode 100644 (file)
index 0000000..184a9ed
--- /dev/null
@@ -0,0 +1,3 @@
+usr/share/freeradius/*
+etc/freeradius/radiusd.conf
+etc/freeradius/dictionary
diff --git a/debian/freeradius-common.postinst b/debian/freeradius-common.postinst
new file mode 100644 (file)
index 0000000..6aae33b
--- /dev/null
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+        if [ -z "$2" ]; then
+          # On a fresh install, add the necessary user and group
+          adduser --quiet --system --no-create-home --home /etc/freeradius --group --disabled-password freerad
+
+          # Put user freerad in group shadow, so the daemon can auth locally
+          # Only do this on fresh install as the admin may not want freerad in shadow
+          # group if authenticating by another mechanism
+          adduser --quiet freerad shadow
+
+          if ! dpkg-statoverride --list | grep -qw /etc/freeradius$; then
+            dpkg-statoverride --add --update freerad freerad 2751 /etc/freeradius
+          fi
+
+          if ! dpkg-statoverride --list | grep -qw /etc/freeradius/radiusd.conf$; then
+            dpkg-statoverride --add --update root freerad 0640 /etc/freeradius/radiusd.conf 
+          fi
+
+          # Relax permissions on local dictionary - allows radclient to run and should
+          # not contain secrets.  At any rate, only do it on fresh install
+          if ! dpkg-statoverride --list | grep -qw /etc/freeradius/dictionary$; then
+            dpkg-statoverride --add --update root freerad 0644 /etc/freeradius/dictionary
+          fi
+
+        fi
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/freeradius-common.postrm b/debian/freeradius-common.postrm
new file mode 100644 (file)
index 0000000..da94965
--- /dev/null
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+        remove)
+               ;;
+        purge)
+               rmdir --ignore-fail-on-non-empty /etc/freeradius
+               # If we haven't managed to remove /etc/freeradius, make
+               # sure that freerad:freerad doesn't own anything before
+               # we remove the user and group
+               test ! -d /etc/freeradius || find /etc/freeradius -user freerad -exec chown root "{}" \; || true
+               test ! -d /etc/freeradius || find /etc/freeradius -group freerad -exec chgrp root "{}" \; || true
+
+               if [ -x `which deluser` ]; then
+                 deluser --quiet freerad shadow || true
+                 deluser --quiet freerad || true
+               fi
+               if [ -x `which delgroup` ]; then
+                 delgroup --quiet freerad || true
+               fi
+               ;;
+         *)
+               ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/debian/freeradius-common.prerm b/debian/freeradius-common.prerm
new file mode 100644 (file)
index 0000000..4ad7743
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  remove)
+        for file in /etc/freeradius/radiusd.conf /etc/freeradius/dictionary; do
+          if dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --remove $file
+          fi
+        done
+
+        if dpkg-statoverride --list | grep -qw /etc/freeradius$; then
+          dpkg-statoverride --remove /etc/freeradius
+        fi
+        ;;
+esac
+
+#DEBHELPER#
index 0c4071a..d175c6e 100644 (file)
@@ -3,10 +3,10 @@ Configuration is in /etc/freeradius-dialupadmin/
 which is linked into the dialupadmin tree in
 /usr/share/freeradius-dialupadmin.
 
-To put this into production, set a path on your
-webserver to point to
-/usr/share/freeradius-dialupadmin/htdocs
-and ensure .php3 is processed by PHP.
+To put this into production, add
+Include /etc/freeradius-dialupadmin/apache2.conf
+
+To the relevant section of your apache configuration.
 
 The scripts make use of .. to access the
 other paths, so symlinking into your webtree
index 4083a94..91b3a4f 100644 (file)
@@ -1,2 +1,5 @@
-dialup_admin/README
-dialup_admin/doc/*
+dialup_admin/doc/AUTHORS
+dialup_admin/doc/FAQ
+dialup_admin/doc/HELP_WANTED
+dialup_admin/doc/HOWTO
+dialup_admin/doc/TODO
index 4dd843d..5c627ca 100644 (file)
@@ -1 +1 @@
-debian/tmp/usr/share/freeradius-dialupadmin/bin/freeradius-dialupadmin.cron
+dialup_admin/bin/dialup_admin.cron
index 4bb1c22..e2de84b 100644 (file)
@@ -1,15 +1,3 @@
-usr/share/freeradius-dialupadmin/bin/backup_radacct
-usr/share/freeradius-dialupadmin/bin/clean_radacct 
-usr/share/freeradius-dialupadmin/bin/clearsession
-usr/share/freeradius-dialupadmin/bin/log_badlogins 
-usr/share/freeradius-dialupadmin/bin/monthly_tot_stats 
-usr/share/freeradius-dialupadmin/bin/showmodem
-usr/share/freeradius-dialupadmin/bin/snmpfinger 
-usr/share/freeradius-dialupadmin/bin/sqlrelay_query
-usr/share/freeradius-dialupadmin/bin/tot_stats
-usr/share/freeradius-dialupadmin/bin/truncate_radacct 
-usr/share/freeradius-dialupadmin/htdocs/
-usr/share/freeradius-dialupadmin/html/
-usr/share/freeradius-dialupadmin/lib/
-usr/share/freeradius-dialupadmin/sql/
 etc/freeradius-dialupadmin
+usr/share/doc/freeradius-dialupadmin
+usr/share/freeradius-dialupadmin
index 469da7f..c4535d1 100644 (file)
@@ -1,2 +1 @@
-usr/lib/freeradius/rlm_sql_iodbc*.la
 usr/lib/freeradius/rlm_sql_iodbc*.so
index ba77575..adfb99d 100755 (executable)
@@ -4,18 +4,19 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius restart
-       else
-               /etc/init.d/freeradius restart
-       fi
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius force-reload
+        else
+          /etc/init.d/freeradius force-reload
+        fi
+        ;;
   abort-upgrade)
-       ;;
+        ;;
   abort-remove)
-       ;;
+        ;;
   abort-deconfigure)
-       ;;
+        ;;
 esac
 
 #DEBHELPER#
+
index 68b1bfa..5ec0bc1 100644 (file)
@@ -1,2 +1 @@
-usr/lib/freeradius/rlm_krb5*.la
 usr/lib/freeradius/rlm_krb5*.so
diff --git a/debian/freeradius-krb5.lintian-overrides b/debian/freeradius-krb5.lintian-overrides
new file mode 100644 (file)
index 0000000..ae4e075
--- /dev/null
@@ -0,0 +1 @@
+freeradius-krb5: binary-or-shlib-defines-rpath
index ba77575..adfb99d 100755 (executable)
@@ -4,18 +4,19 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius restart
-       else
-               /etc/init.d/freeradius restart
-       fi
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius force-reload
+        else
+          /etc/init.d/freeradius force-reload
+        fi
+        ;;
   abort-upgrade)
-       ;;
+        ;;
   abort-remove)
-       ;;
+        ;;
   abort-deconfigure)
-       ;;
+        ;;
 esac
 
 #DEBHELPER#
+
index 8a46152..c5d9004 100644 (file)
@@ -1,2 +1 @@
-usr/lib/freeradius/rlm_ldap*.la
 usr/lib/freeradius/rlm_ldap*.so
diff --git a/debian/freeradius-ldap.lintian-overrides b/debian/freeradius-ldap.lintian-overrides
new file mode 100644 (file)
index 0000000..a18fc0c
--- /dev/null
@@ -0,0 +1 @@
+freeradius-ldap: binary-or-shlib-defines-rpath
index ba77575..adfb99d 100755 (executable)
@@ -4,18 +4,19 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius restart
-       else
-               /etc/init.d/freeradius restart
-       fi
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius force-reload
+        else
+          /etc/init.d/freeradius force-reload
+        fi
+        ;;
   abort-upgrade)
-       ;;
+        ;;
   abort-remove)
-       ;;
+        ;;
   abort-deconfigure)
-       ;;
+        ;;
 esac
 
 #DEBHELPER#
+
index 5add9db..60ac07a 100644 (file)
@@ -1,2 +1,2 @@
-usr/lib/freeradius/rlm_sql_mysql*.la
 usr/lib/freeradius/rlm_sql_mysql*.so
+etc/freeradius/sql/mysql/*
index ba77575..2d4b6c4 100755 (executable)
@@ -4,18 +4,36 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius restart
-       else
-               /etc/init.d/freeradius restart
-       fi
-       ;;
-  abort-upgrade)
-       ;;
-  abort-remove)
-       ;;
-  abort-deconfigure)
+        for file in /etc/freeradius/sql/mysql/counter.conf \
+          /etc/freeradius/sql/mysql/dialup.conf \
+          /etc/freeradius/sql/mysql/ippool.conf \
+          /etc/freeradius/sql/mysql/ippool.sql \
+          /etc/freeradius/sql/mysql/nas.sql \
+          /etc/freeradius/sql/mysql/schema.sql
+        do
+          if ! dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --add --update root freerad 0640 $file
+          fi
+        done
+
+        for dir in /etc/freeradius/sql \
+          /etc/freeradius/sql/mysql
+        do
+          if ! dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --add --update root freerad 2751 $dir
+          fi
+        done
+
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius force-reload
+        else
+          /etc/init.d/freeradius force-reload
+        fi
        ;;
 esac
 
 #DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/freeradius-mysql.prerm b/debian/freeradius-mysql.prerm
new file mode 100644 (file)
index 0000000..9f035bd
--- /dev/null
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+  remove)
+        for file in /etc/freeradius/sql/mysql/counter.conf \
+          /etc/freeradius/sql/mysql/dialup.conf \
+          /etc/freeradius/sql/mysql/ippool.conf \
+          /etc/freeradius/sql/mysql/ippool.sql \
+          /etc/freeradius/sql/mysql/nas.sql \
+          /etc/freeradius/sql/mysql/schema.sql
+        do
+          if dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --remove $file
+          fi
+        done
+
+        for dir in /etc/freeradius/sql \
+          /etc/freeradius/sql/mysql
+        do
+          if dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --remove $dir
+          fi
+        done
+       ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
index 31cdfc3..b4c031a 100644 (file)
@@ -1,2 +1,2 @@
-usr/lib/freeradius/rlm_sql_postgresql*.la
 usr/lib/freeradius/rlm_sql_postgresql*.so
+etc/freeradius/sql/postgresql/*
index ba77575..313310c 100755 (executable)
@@ -4,18 +4,40 @@ set -e
 
 case "$1" in
   configure)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius restart
-       else
-               /etc/init.d/freeradius restart
-       fi
-       ;;
-  abort-upgrade)
-       ;;
-  abort-remove)
-       ;;
-  abort-deconfigure)
+        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
+          /etc/freeradius/sql/postgresql/counter.conf \
+          /etc/freeradius/sql/postgresql/dialup.conf \
+          /etc/freeradius/sql/postgresql/ippool.conf \
+          /etc/freeradius/sql/postgresql/ippool.sql \
+          /etc/freeradius/sql/postgresql/nas.sql \
+          /etc/freeradius/sql/postgresql/schema.sql \
+          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
+          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        do
+          if ! dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --add --update root freerad 0640 $file
+          fi
+        done
+
+        for dir in /etc/freeradius/sql \
+          /etc/freeradius/sql/postgresql
+        do
+          if ! dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --add --update root freerad 2751 $dir
+          fi
+        done
+
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius force-reload
+        else
+          /etc/init.d/freeradius force-reload
+        fi
        ;;
 esac
 
 #DEBHELPER#
+
+exit 0
+
+
+
diff --git a/debian/freeradius-postgresql.prerm b/debian/freeradius-postgresql.prerm
new file mode 100644 (file)
index 0000000..ed92461
--- /dev/null
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+  remove)
+        for file in /etc/freeradius/sql/postgresql/cisco_h323_db_schema.sql \
+          /etc/freeradius/sql/postgresql/counter.conf \
+          /etc/freeradius/sql/postgresql/dialup.conf \
+          /etc/freeradius/sql/postgresql/ippool.conf \
+          /etc/freeradius/sql/postgresql/ippool.sql \
+          /etc/freeradius/sql/postgresql/nas.sql \
+          /etc/freeradius/sql/postgresql/schema.sql \
+          /etc/freeradius/sql/postgresql/update_radacct_group_trigger.sql \
+          /etc/freeradius/sql/postgresql/voip-postpaid.conf
+        do
+          if dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --remove $file
+          fi
+        done
+
+        for dir in /etc/freeradius/sql \
+          /etc/freeradius/sql/postgresql
+        do
+          if dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --remove $dir
+          fi
+        done
+       ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/freeradius-utils.install b/debian/freeradius-utils.install
new file mode 100644 (file)
index 0000000..9bc0d62
--- /dev/null
@@ -0,0 +1,12 @@
+usr/bin/rlm_dbm_cat
+usr/bin/rlm_dbm_parser
+usr/bin/radeapclient
+usr/bin/rlm_ippool_tool
+usr/bin/smbencrypt
+usr/bin/radclient
+usr/bin/radwho
+usr/bin/radsniff
+usr/bin/radlast
+usr/bin/radtest
+usr/bin/radzap
+usr/bin/radsqlrelay
diff --git a/debian/freeradius-utils.lintian-overrides b/debian/freeradius-utils.lintian-overrides
new file mode 100644 (file)
index 0000000..b9e3b4f
--- /dev/null
@@ -0,0 +1 @@
+freeradius-utils: binary-or-shlib-defines-rpath
index f946a4b..f4af486 100644 (file)
@@ -1,23 +1,5 @@
-etc/
-etc/freeradius
-etc/init.d
-usr/
-usr/bin
-usr/lib
+etc/freeradius/certs
+etc/freeradius/sites-enabled
+etc/freeradius/sites-available
 usr/lib/freeradius
-usr/share
-usr/share/doc
-usr/share/doc/freeradius
-usr/share/man/
-usr/share/man/man1
-usr/share/man/man5
-usr/share/man/man8
-usr/share/snmp/mibs
-usr/share/freeradius
-usr/sbin
-var/
-var/log
 var/log/freeradius
-var/log/freeradius/radacct
-var/run
-var/run/freeradius
index 1992469..ba1e8eb 100644 (file)
@@ -1,2 +1,3 @@
+debian/README.rfc
 CREDITS
 debian/tmp/usr/share/doc/freeradius/*
index faf6b0f..3bfe7c3 100644 (file)
@@ -2,10 +2,21 @@ src/billing/
 scripts/clients.pl
 scripts/create-users.pl
 scripts/cryptpasswd
+scripts/cryptpasswd.in
 scripts/exec-program-wait
+scripts/Makefile
+scripts/min-includes.pl
 scripts/radiusd2ldif.pl
 scripts/radiusd.cron.daily
+scripts/radiusd.cron.daily.in
 scripts/radiusd.cron.monthly
+scripts/radiusd.cron.monthly.in
 scripts/radiusd.sh
+scripts/radsqlrelay
+scripts/radwatch
+scripts/radwatch.in
+scripts/rc.radiusd
+scripts/rc.radiusd.in
 scripts/users2mysql.pl
-src/modules/rlm_perl/example.pl
+debian/tmp/etc/freeradius/example.pl
+debian/tmp/etc/freeradius/certs
index e90c5e7..0738914 100755 (executable)
 # Start/stop the FreeRADIUS daemon.
 
 ### BEGIN INIT INFO
-# Provides:          radiusd
-# Required-Start:    $network
-# Should-Start:      $time mysql ldap postgresql samba krb5-kdc
-# Required-Stop:
+# Provides:          freeradius
+# Required-Start:    $remote_fs $network $syslog
+# Should-Start:      $time mysql slapd postgresql samba krb5-kdc
+# Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: FreeRADIUS server
-# Description:       Extensible, configurable, high performance RADIUS server.
+# Short-Description: Radius Daemon 
+# Description:       Extensible, configurable radius daemon
 ### END INIT INFO
 
-# Do NOT "set -e"
+set -e
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="FreeRADIUS server"
-NAME=freeradius
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Default values for config variables
-FR_USER=freerad
-FR_GROUP=freerad
-FR_ARGS=
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
+. /lib/lsb/init-functions
 
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+PROG="freeradius"
+PROGRAM="/usr/sbin/freeradius"
+PIDFILE="/var/run/freeradius/freeradius.pid"
+DESCR="FreeRADIUS daemon"
 
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB start_daemon, killproc and log_* functions.
-. /lib/lsb/init-functions
+test -f $PROGRAM || exit 0
 
 # /var/run may be a tmpfs
-if [ ! -d /var/run/$NAME ]; then
-       install -o "$FR_USER" -g "$FR_GROUP" -m 0755 -d /var/run/$NAME
-       if [ $? -ne 0 ]; then
-               echo "Error creating the /var/run/$NAME directory."
-               exit 1
-       fi
+if [ ! -d /var/run/freeradius ]; then
+  mkdir -p /var/run/freeradius
+  chown freerad:freerad /var/run/freeradius
 fi
 
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+ret=0
+
 case "$1" in
-  start)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-       start_daemon -p $PIDFILE $DAEMON $FR_ARGS
-       if [ $? -ne 0 ]; then
-               [ "$VERBOSE" != no ] && log_end_msg 1 || \
-               log_failure_msg "Run '$DAEMON -X' to find out why."
-               exit 1
-       fi
-       [ "$VERBOSE" != no ] && log_end_msg 0
-       ;;
-  stop)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-       killproc -p $PIDFILE $DAEMON
-       if [ $? -ne 0 ]; then
-               [ "$VERBOSE" != no ] && log_end_msg 1
-               exit 1
-       fi
-       [ "$VERBOSE" != no ] && log_end_msg 0
-       ;;
-  restart)
-       log_daemon_msg "Restarting $DESC" "$NAME"
-       killproc -p $PIDFILE $DAEMON
-       if [ $? -ne 0 ]; then
-               log_end_msg 1
-               log_failure_msg "Failed to stop $NAME."
-               exit 1
-       fi
-       start_daemon -p $PIDFILE $DAEMON $FR_ARGS
-       if [ $? -ne 0 ]; then
-               log_end_msg 1
-               log_failure_msg "Failed to start $NAME."
-               log_failure_msg "Run '$DAEMON -X' to find out why."
-               exit 1
-       fi
-       log_end_msg 0
-       ;;
-  reload|force-reload)
-       log_daemon_msg "Reloading $DESC" "$NAME"
-       killproc -p $PIDFILE $DAEMON -SIGHUP
-       if [ $? -ne 0 ]; then
-               log_end_msg 1
-               exit 1
-       fi
-       sleep 2
-       pidofproc -p $PIDFILE > /dev/null
-       if [ $? -ne 0 ]; then
-               log_end_msg 1
-               log_failure_msg "$NAME has died."
-               exit 1
-       fi
-       log_end_msg 0
-       ;;
-  *)
-       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-       exit 3
-       ;;
+        start)
+                log_daemon_msg "Starting $DESCR" "$PROG"
+                start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $PROGRAM || ret=$?
+                log_end_msg $ret
+                exit $ret
+                ;;
+        stop)
+                log_daemon_msg "Stopping $DESCR" "$PROG"
+                if [ -f "$PIDFILE" ] ; then
+                  start-stop-daemon --stop --retry=TERM/30/KILL/5 --quiet --pidfile $PIDFILE || ret=$?
+                  log_end_msg $ret
+                else 
+                  log_action_cont_msg "$PIDFILE not found"
+                  log_end_msg 0
+                fi
+                ;;
+        restart|force-reload)
+                $0 stop
+                $0 start
+                ;;
+        *)
+                echo "Usage: $0 start|stop|restart|force-reload"
+                exit 1 
+                ;;
 esac
 
 exit 0
index 340c99b..fea2d96 100644 (file)
@@ -1,8 +1,27 @@
-etc/freeradius
-usr/bin
-usr/include/freeradius
-usr/lib/freeradius/*.la
-usr/lib/freeradius/*.so
-usr/sbin
-usr/share/snmp/mibs
-usr/share/freeradius
+etc/freeradius/acct_users
+etc/freeradius/attrs
+etc/freeradius/attrs.access_reject
+etc/freeradius/attrs.accounting_response
+etc/freeradius/attrs.pre-proxy
+etc/freeradius/clients.conf
+etc/freeradius/eap.conf
+etc/freeradius/experimental.conf
+etc/freeradius/hints
+etc/freeradius/huntgroups
+etc/freeradius/ldap.attrmap
+etc/freeradius/modules/*
+etc/freeradius/policy.conf
+etc/freeradius/policy.txt
+etc/freeradius/preproxy_users
+etc/freeradius/proxy.conf
+etc/freeradius/sites-available/*
+etc/freeradius/sql.conf
+etc/freeradius/sqlippool.conf
+etc/freeradius/templates.conf
+etc/freeradius/users
+usr/lib/freeradius/rlm*.so
+usr/sbin/checkrad
+usr/sbin/freeradius
+usr/sbin/radwatch
+usr/sbin/raddebug
+usr/sbin/radmin
index e0924ff..1be995a 100644 (file)
@@ -1,6 +1,7 @@
 /var/log/freeradius/*.log {
-       weekly
-       rotate 52
-       compress
-       notifempty
+        weekly
+        rotate 52
+        compress
+        notifempty
 }
+
index f8c5935..8ed34b0 100755 (executable)
@@ -2,88 +2,97 @@
 
 set -e
 
-new_install()
-{
-       # On a fresh install, add the necessary user and group.
-       if ! id freerad >/dev/null 2>&1; then
-               addgroup --system freerad || true
-               groups freerad 2>/dev/null || adduser --system --no-create-home --home /etc/freeradius --ingroup freerad --disabled-password freerad
-
-               # Put user freerad in group shadow, so the daemon can auth
-               # locally. Only do this on fresh install as the admin may not
-               # want freerad in shadow group if authenticating by another
-               # mechanism.
-               adduser freerad shadow
-       fi
-
-       # Changed in 1.1.5-1 for new installs (we used to start at S50
-       # and stop at K50)  We now start at S50 and stop at K19 so we
-       # start after services which may be used and stop before them.
-       update-rc.d freeradius start 50 2 3 4 5 . stop 19 0 1 6 . >/dev/null
+case "$1" in
+  configure)
+        if [ -z "$2" ]; then
+          # Changed in 1.1.5-1 for new installs (we used to start at S50
+          # and stop at K50)  We now start at S50 and stop at K19 so we
+          # start after services which may be used and stop before them.
+          update-rc.d freeradius start 50 2 3 4 5 . stop 19 0 1 6 . >/dev/null
 
-       # Set up initial permissions on all the FreeRADIUS directories.
-       if [ ! -d /var/log/freeradius ]; then
-               mkdir -p /var/log/freeradius
-       fi
+          # Set up initial permissions on all the freeradius directories
 
-       if [ ! -f /var/log/freeradius/radius.log ]; then
-               touch /var/log/freeradius/radius.log
-       fi
+          if ! dpkg-statoverride --list | grep -q /var/run/freeradius$; then
+            dpkg-statoverride --add --update freerad freerad 0755 /var/run/freeradius
+          fi
 
-       if [ ! -f /var/log/freeradius/radwtmp ]; then
-               touch /var/log/freeradius/radwtmp
-       fi
+          if ! dpkg-statoverride --list | grep -q /var/log/freeradius$; then
+            dpkg-statoverride --add --update freerad freerad 0750 /var/log/freeradius
+          fi
 
-       if [ ! -d /var/run/freeradius ]; then
-               mkdir /var/run/freeradius
-       fi
+          for file in radius.log radwtmp; do
+            [ ! -f "/var/log/freeradius/${file}" ] && install -o freerad -g freerad -m 644 /dev/null /var/log/freeradius/${file}
+          done
 
-       chown -R freerad:freerad /var/log/freeradius
-       chown -R freerad:freerad /var/run/freeradius
-       chgrp -R freerad /etc/freeradius
-       find /etc/freeradius -type d -print0 | xargs -0 chmod 2750
-       find /etc/freeradius -type f -print0 | xargs -0 chmod 0640
+          for file in /etc/freeradius/preproxy_users \
+            /etc/freeradius/policy.conf \
+            /etc/freeradius/eap.conf \
+            /etc/freeradius/experimental.conf \
+            /etc/freeradius/huntgroups \
+            /etc/freeradius/proxy.conf \
+            /etc/freeradius/attrs.pre-proxy \
+            /etc/freeradius/hints \
+            /etc/freeradius/sql.conf \
+            /etc/freeradius/ldap.attrmap \
+            /etc/freeradius/attrs \
+            /etc/freeradius/policy.txt \
+            /etc/freeradius/attrs.accounting_response \
+            /etc/freeradius/attrs.access_reject \
+            /etc/freeradius/clients.conf \
+            /etc/freeradius/acct_users
+          do
+            if ! dpkg-statoverride --list | grep -qw $file$; then
+              dpkg-statoverride --add --update root freerad 0640 $file
+            fi
+          done
 
-       # Relax permissions on local dictionary: it should not contain
-       # secrets, and this allows to run radclient with a non-privileged
-       # user. At any rate, only do it on fresh install.
-       chmod 2751 /etc/freeradius
-       chmod 0644 /etc/freeradius/dictionary
+          for dir in /etc/freeradius/certs/ \
+            /etc/freeradius/sites-available/ \
+            /etc/freeradius/sites-enabled/
+          do
+            if ! dpkg-statoverride --list | grep -qw $dir$; then
+              dpkg-statoverride --add --update freerad freerad 2751 $dir
+            fi
+          done
 
-       # Create default certificates to enable the EAP modules (tls, ttls,
-       # and peap) when the server starts for the first time.
-       # Comment the last line when building a package without OpenSSL for
-       # the Debian archive.
-       chmod 0750 /etc/freeradius/certs/bootstrap
-       /etc/freeradius/certs/bootstrap
-}
+          action="start"
+        else
+          action="restart"
+        fi
 
-case "$1" in
-  configure)
-       if [ -z "$2" ]; then
-               new_install
-               action="start"
-       else
-               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
-               /etc/init.d/freeradius $action
-       fi
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius $action || true
+        else
+          /etc/init.d/freeradius $action
+        fi
+        ;;
   abort-upgrade)
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius restart || true
+        else
+          /etc/init.d/freeradius restart
+        fi
+        ;;
   abort-remove)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-               invoke-rc.d freeradius start || true
-       else
-               /etc/init.d/freeradius start
-       fi
-       ;;
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+          invoke-rc.d freeradius start || true
+        else
+          /etc/init.d/freeradius start
+        fi
+        ;;
   abort-deconfigure)
-       ;;
+        ;;
 esac
 
 #DEBHELPER#
index d206391..de836f8 100755 (executable)
@@ -3,38 +3,20 @@
 set -e
 
 case "$1" in
-       remove)
-               ;;
-       purge)
-               update-rc.d -f freeradius remove >/dev/null
-               if [ -d /var/log/freeradius ]
-               then
-                       rm -rf /var/log/freeradius
-               fi
-               # Make sure we remove the /var/run directory as well.
-               # It can sometimes get left behind and, as we remove
-               # the user, it ends up owned by a non-existant user.
-               if [ -d /var/run/freeradius ]
-               then
-                       rm -rf /var/run/freeradius
-               fi
-               rmdir --ignore-fail-on-non-empty /etc/freeradius
-               # If we haven't managed to remove /etc/freeradius, make
-               # sure that freerad:freerad doesn't own anything before
-               # we remove the user and group.
-               if [ -d /etc/freeradius ]
-               then
-                       find /etc/freeradius -user freerad -print0 | \
-                               xargs -0 -r chown root
-                       find /etc/freeradius -group freerad -print0 | \
-                               xargs -0 -r chgrp root
-               fi
-               deluser freerad shadow || true
-               deluser freerad || true
-               delgroup freerad || true
-               ;;
-       *)
-               ;;
+        remove)
+               ;;
+        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
+
+               rm -f /var/log/freeradius/radius.log* /var/log/freeradius/radwtmp*
+               ;;
 esac
 
 #DEBHELPER#
diff --git a/debian/freeradius.preinst b/debian/freeradius.preinst
new file mode 100644 (file)
index 0000000..de8ac1c
--- /dev/null
@@ -0,0 +1,72 @@
+#! /bin/sh
+
+set -e
+
+# Remove a no-longer used conffile; taken from http://wiki.debian.org/DpkgConffileHandling
+rm_conffile() {
+    CONFFILE="$1"
+
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+        if [ "$md5sum" != "$old_md5sum" ]; then
+            echo "Obsolete conffile $CONFFILE has been modified by you."
+            echo "Saving as $CONFFILE.dpkg-bak ..."
+            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+        else
+            echo "Removing obsolete conffile $CONFFILE ..."
+            rm -f "$CONFFILE"
+        fi
+    fi
+}
+
+case "$1" in
+  upgrade)
+    # Before 1.1.5, upstream shipped /etc/freeradius/otppasswd.sample
+    # and we install it (I still don't know why).  In 1.1.5 they
+    # got rid of it so handle removing the conffile.
+    if dpkg --compare-versions "$2" lt "1.1.5"; then
+        rm_conffile "/etc/freeradius/otppasswd.sample"
+    fi
+    # There are huge changes between 1.x and 2.x (we cleaned things up
+    # a lot), so sort it out here
+    if dpkg --compare-versions "$2" lt "2.0.0"; then
+
+        rm_conffile "/etc/freeradius/certs/demoCA/cacert.pem"
+        rm_conffile "/etc/freeradius/certs/demoCA/index.txt"
+        rm_conffile "/etc/freeradius/certs/demoCA/index.txt.old"
+        rm_conffile "/etc/freeradius/certs/demoCA/serial"
+        rm_conffile "/etc/freeradius/certs/demoCA/serial.old"
+
+        test -d /etc/freeradius/certs/demoCA && rmdir --ignore-fail-on-non-empty /etc/freeradius/certs/demoCA/
+
+        rm_conffile "/etc/freeradius/certs/cert-clt.der"
+        rm_conffile "/etc/freeradius/certs/cert-clt.p12"
+        rm_conffile "/etc/freeradius/certs/cert-clt.pem"
+        rm_conffile "/etc/freeradius/certs/cert-srv.der"
+        rm_conffile "/etc/freeradius/certs/cert-srv.p12"
+        rm_conffile "/etc/freeradius/certs/cert-srv.pem"
+        rm_conffile "/etc/freeradius/certs/dh"
+        rm_conffile "/etc/freeradius/certs/newcert.pem"
+        rm_conffile "/etc/freeradius/certs/newreq.pem"
+        rm_conffile "/etc/freeradius/certs/random"
+        rm_conffile "/etc/freeradius/certs/README"
+        rm_conffile "/etc/freeradius/certs/root.der"
+        rm_conffile "/etc/freeradius/certs/root.p12"
+        rm_conffile "/etc/freeradius/certs/root.pem"
+
+        rm_conffile "/etc/freeradius/sqlippool.conf"
+        rm_conffile "/etc/freeradius/mssql.conf"
+        rm_conffile "/etc/freeradius/postgresql.conf"
+
+        rm_conffile "/etc/freeradius/naslist"
+        rm_conffile "/etc/freeradius/naspasswd"
+        rm_conffile "/etc/freeradius/realms"
+
+    fi
+
+esac
+
+#DEBHELPER#
+
+exit 0
index 49d6125..0b7f909 100755 (executable)
@@ -4,17 +4,55 @@ set -e
 
 case "$1" in
   remove)
-       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                invoke-rc.d freeradius stop
        else
                /etc/init.d/freeradius stop
        fi
-       ;;
-  upgrade)
-       ;;
-  failed-upgrade)
-       ;;
-  deconfigure)
+
+        for file in /etc/freeradius/preproxy_users \
+          /etc/freeradius/policy.conf \
+          /etc/freeradius/eap.conf \
+          /etc/freeradius/experimental.conf \
+          /etc/freeradius/huntgroups \
+          /etc/freeradius/proxy.conf \
+          /etc/freeradius/attrs.pre-proxy \
+          /etc/freeradius/hints \
+          /etc/freeradius/sql.conf \
+          /etc/freeradius/ldap.attrmap \
+          /etc/freeradius/attrs \
+          /etc/freeradius/policy.txt \
+          /etc/freeradius/attrs.accounting_response \
+          /etc/freeradius/attrs.access_reject \
+          /etc/freeradius/clients.conf \
+          /etc/freeradius/acct_users
+        do
+          if dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --remove $file
+          fi
+        done
+
+        # old files shipped by this package previously - still need to
+        # get rid of the overrides otherwise they corrupt the database
+        for file in \
+          /etc/freeradius/otp.conf \
+          /etc/freeradius/snmp.conf
+        do
+          if dpkg-statoverride --list | grep -qw $file$; then
+            dpkg-statoverride --remove $file
+          fi
+        done
+
+        for dir in /etc/freeradius/certs \
+          /etc/freeradius/sites-available \
+          /etc/freeradius/sites-enabled \
+          /var/run/freeradius \
+          /var/log/freeradius
+        do
+          if dpkg-statoverride --list | grep -qw $dir$; then
+            dpkg-statoverride --remove $dir
+          fi
+        done
        ;;
 esac
 
index 22ddaa1..e2597e0 100644 (file)
@@ -4,7 +4,7 @@
 
 # We fall back to the system default in /etc/pam.d/common-*
 # 
-
+        
 @include common-auth
 @include common-account
 @include common-password
diff --git a/debian/libfreeradius-dev.install b/debian/libfreeradius-dev.install
new file mode 100644 (file)
index 0000000..1773d52
--- /dev/null
@@ -0,0 +1,5 @@
+usr/lib/freeradius/libfreeradius-radius.so
+usr/lib/freeradius/libfreeradius-eap.so
+usr/lib/freeradius/libfreeradius-radius.a
+usr/lib/freeradius/libfreeradius-eap.a
+usr/include/freeradius/*.h
diff --git a/debian/libfreeradius2.install b/debian/libfreeradius2.install
new file mode 100644 (file)
index 0000000..0019b93
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/freeradius/libfreeradius*2*.so
diff --git a/debian/libfreeradius2.lintian-overrides b/debian/libfreeradius2.lintian-overrides
new file mode 100644 (file)
index 0000000..cd8eb87
--- /dev/null
@@ -0,0 +1 @@
+libfreeradius2: binary-or-shlib-defines-rpath
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index d2e37a7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-01-radiusd-to-freeradius.dpatch
-02-dialupadmin-help.dpatch
old mode 100755 (executable)
new mode 100644 (file)
similarity index 85%
rename from debian/patches/02-dialupadmin-help.dpatch
rename to debian/patches/dialupadmin-help.diff
index a623728..a591d9e
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02-dialupadmin-help.dpatch by Mark Hymers <mark@hymers.org.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix README location
 
-@DPATCH@
-
 --- old/dialup_admin/htdocs/help/help.php3     (revision 1519)
 +++ new/dialup_admin/htdocs/help/help.php3     (working copy)
 @@ -48,13 +48,13 @@
diff --git a/debian/patches/gitignore.diff b/debian/patches/gitignore.diff
new file mode 100644 (file)
index 0000000..ba9b52e
--- /dev/null
@@ -0,0 +1,17 @@
+--- freeradius-2.0.4+dfsg.orig/.gitignore
++++ freeradius-2.0.4+dfsg/.gitignore
+@@ -0,0 +1,14 @@
++*.la
++*.o
++*.lo
++.libs
++.deps
++build-arch-stamp
++build-indep-stamp
++config.h
++config.log
++config.status
++config.cache
++config.guess.dist
++config.sub.dist
++Make.inc
diff --git a/debian/patches/raddebug.man.diff b/debian/patches/raddebug.man.diff
new file mode 100644 (file)
index 0000000..20d0843
--- /dev/null
@@ -0,0 +1,8 @@
+--- freeradius-2.1.7+dfsg/man/man8/raddebug.8  2009-09-14 16:43:29.000000000 +0200
++++ freeradius-2.1.7+dfsg/man/man8/raddebug.8  2009-11-24 15:36:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-.TH RADDEBUG 1 "13 February 2009" "" "FreeRADIUS Daemon"
++.TH RADDEBUG 8 "13 February 2009" "" "FreeRADIUS Daemon"
+ .SH NAME
+ raddebug - Display debugging output from a running server.
+ .SH SYNOPSIS
old mode 100755 (executable)
new mode 100644 (file)
similarity index 89%
rename from debian/patches/01-radiusd-to-freeradius.dpatch
rename to debian/patches/radiusd-to-freeradius.diff
index b4e526e..79ddb1f
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01-radiusd-to-freeradius.dpatch by Mark Hymers <mark@hymers.org.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: change debian binary name from radiusd -> freeradius
 
-@DPATCH@
-
 --- old/Make.inc.in    (revision 1496)
 +++ new/Make.inc.in    (working copy)
 @@ -48,7 +48,7 @@
diff --git a/debian/patches/rlm_perl.diff b/debian/patches/rlm_perl.diff
new file mode 100644 (file)
index 0000000..e243dcf
--- /dev/null
@@ -0,0 +1,33 @@
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_perl/rlm_perl.c
++++ freeradius-2.0.4+dfsg/src/modules/rlm_perl/rlm_perl.c
+@@ -717,10 +717,13 @@
+       HV              *rad_request_proxy_reply_hv;
+       AV              *end_AV;
+-      char *embed[4];
++      char **embed;
++        char **envp = NULL;
+       const char *xlat_name;
+       int exitstatus = 0, argc=0;
++        embed = rad_malloc(4*(sizeof(char *)));
++        memset(embed, 0, sizeof(4*(sizeof(char *))));
+       /*
+        *      Set up a storage area for instance data
+        */
+@@ -749,6 +752,7 @@
+               argc = 3;
+       }
++        PERL_SYS_INIT3(&argc, &embed, &envp);
+ #ifdef USE_ITHREADS
+       inst->perl = interp;
+@@ -1296,6 +1300,7 @@
+       perl_free(inst->perl);
+ #endif
++        PERL_SYS_TERM();
+       free(inst);
+       return exitstatus;
+ }
diff --git a/debian/patches/rlm_sql.libs.diff b/debian/patches/rlm_sql.libs.diff
new file mode 100644 (file)
index 0000000..fba93d7
--- /dev/null
@@ -0,0 +1,58 @@
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql_log/Makefile
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sql_log/Makefile
+@@ -6,5 +6,6 @@
+ TARGET      = rlm_sql_log
+ SRCS        = rlm_sql_log.c
++RLM_LIBS    += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ include ../rules.mak
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sqlcounter/Makefile.in
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sqlcounter/Makefile.in
+@@ -6,7 +6,7 @@
+ SRCS        = rlm_sqlcounter.c
+ HEADERS     =
+ RLM_CFLAGS  = @sqlcounter_cflags@
+-RLM_LIBS    = @sqlcounter_ldflags@
++RLM_LIBS    = @sqlcounter_ldflags@ $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ RLM_INSTALL =
+ include ../rules.mak
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sqlippool/Makefile.in
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sqlippool/Makefile.in
+@@ -8,7 +8,7 @@
+ SRCS        = rlm_sqlippool.c
+ HEADERS     = $(top_builddir)/src/modules/rlm_sql/rlm_sql.h
+ RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql $(INCLTDL)
+-RLM_LIBS    =
++RLM_LIBS    += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ RLM_INSTALL =
+ include ../rules.mak
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
+@@ -4,5 +4,6 @@
+ SRCS          = sql_postgresql.c
+ RLM_SQL_CFLAGS        = @postgresql_cflags@ $(INCLTDL)
+ RLM_SQL_LIBS  = @postgresql_ldflags@
++RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ include ../rules.mak
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
+@@ -4,5 +4,6 @@
+ SRCS           = sql_iodbc.c
+ RLM_SQL_CFLAGS = @sql_iodbc_cflags@ $(INCLTDL)
+ RLM_SQL_LIBS   = @sql_iodbc_ldflags@
++RLM_LIBS      += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ include ../rules.mak
+--- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
++++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
+@@ -4,5 +4,6 @@
+ SRCS           = sql_mysql.c
+ RLM_SQL_CFLAGS = @sql_mysql_cflags@ $(INCLTDL)
+ RLM_SQL_LIBS   = @sql_mysql_ldflags@
++RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
+ include ../rules.mak
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..64355df
--- /dev/null
@@ -0,0 +1,6 @@
+radiusd-to-freeradius.diff
+dialupadmin-help.diff
+gitignore.diff
+rlm_sql.libs.diff
+rlm_perl.diff
+raddebug.man.diff
index 702bec5..db6cd19 100755 (executable)
@@ -1,66 +1,74 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
 #
-#      debian/rules file for freeradius
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 #
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
-.NOTPARALLEL:
-
-SHELL          = /bin/bash
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 
-package                = freeradius
-freeradius_dir = $(CURDIR)/debian/tmp
+.NOTPARALLEL:
 
-mandir         = /usr/share/man
-libdir         = /usr/lib/$(package)
-logdir         = /var/log/$(package)
-pkgdocdir      = /usr/share/doc/$(package)
-raddbdir       = /etc/$(package)
+SHELL           =/bin/bash
 
-# Use "openssl=no" below to build a binary-distributable version
-# for the Debian archive.
-openssl = yes
+package         = freeradius
+freeradius_dir  = $(CURDIR)/debian/tmp/
 
-include /usr/share/dpatch/dpatch.make
+mandir          = /usr/share/man
+libdir          = /usr/lib/$(package)
+logdir          = /var/log/$(package)
+pkgdocdir       = /usr/share/doc/$(package)
+raddbdir        = /etc/$(package)
 
 modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql
+pkgs=$(shell dh_listpackages)
 
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS := $(CFLAGS) -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
 else
        CFLAGS += -O2
 endif
 
-export CFLAGS
-
-# Autoconf 2.52+ arch support
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
        confflags += --build $(DEB_HOST_GNU_TYPE)
 else
-       confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
+       confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-ifeq ($(openssl), no)
-        confflags += --without-openssl --without-rlm_eap_peap --without-rlm_eap_tls --without-rlm_eap_ttls --without-rlm_otp
-endif
+include /usr/share/quilt/quilt.make
 
-configure-stamp: patch-stamp
+config.status: configure
        dh_testdir
 
-       # Update the autotools files if necessary
-       # Force Build-Depends on autotools-dev for /usr/share/misc/config.*
-       if [ -e config.sub.dist ]; then rm config.sub; else mv config.sub config.sub.dist; fi
-       if [ -e config.guess.dist ]; then rm config.guess; else mv config.guess config.guess.dist; fi
+ifeq (config.sub.dist,$(wildcard config.sub.dist))
+       rm config.sub
+else
+       mv config.sub config.sub.dist
+endif
+ifeq (config.guess.dist,$(wildcard config.guess.dist))
+       rm config.guess
+else
+       mv config.guess config.guess.dist
+endif
        ln -s /usr/share/misc/config.sub config.sub
        ln -s /usr/share/misc/config.guess config.guess
+       
 
-       ./configure \
-               $(confflags) \
-               --config-cache \
+       ./configure $(confflags) \
                --prefix=/usr \
                --exec-prefix=/usr \
                --mandir=$(mandir) \
@@ -70,131 +78,142 @@ configure-stamp: patch-stamp
                --localstatedir=/var \
                --with-raddbdir=$(raddbdir) \
                --with-logdir=/var/log/$(package) \
-               --with-system-libtool --disable-ltdl-install \
+               --enable-ltdl-install=no --enable-strict-dependencies \
                --with-large-files --with-udpfromto --with-edir \
                --enable-developer \
-               --with-rlm-sql-postgresql-lib-dir=`pg_config --libdir` \
-               --with-rlm-sql-postgresql-include-dir=`pg_config --includedir`
-
-       touch configure-stamp
-
-build: build-arch build-indep
-
-build-indep: patch build-indep-stamp
-build-indep-stamp: configure-stamp
-       touch build-indep-stamp
+               --config-cache \
+               --without-rlm_eap_tls \
+               --without-rlm_eap_ttls \
+               --without-rlm_eap_peap \
+               --without-rlm_eap_tnc \
+               --without-rlm_otp \
+               --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` \
+               --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \
+               --without-openssl \
+               --without-rlm_eap_ikev2 \
+               --without-rlm_sql_oracle \
+               --without-rlm_sql_unixodbc \
+               --with-system-libtool
+
+#Architecture 
+build: patch build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-       $(MAKE)
-       touch build-arch-stamp
+build-arch-stamp: config.status
+       $(MAKE) 
+       touch $@
 
-install: install-arch install-indep
+build-indep: build-indep-stamp
+build-indep-stamp: config.status
+       touch $@
 
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep-stamp
+clean: unpatch
        dh_testdir
        dh_testroot
+       rm -f build-arch-stamp build-indep-stamp 
+       rm -f config.cache config.log
+       rm -f src/freeradius-devel
+       
+       [ ! -d src/modules/lib ] || rm -fr src/modules/lib || true
+       [ ! -d src/binary ] || rm -fr src/binary || true
+
+       # Add here commands to clean up after the build process.
+ifeq (Make.inc,$(wildcard Make.inc))
+       $(MAKE) distclean
+endif
+ifeq (config.sub.dist,$(wildcard config.sub.dist))
+       rm -f config.sub
+       mv config.sub.dist config.sub
+endif
+ifeq (config.guess.dist,$(wildcard config.guess.dist))
+       rm -f config.guess
+       mv config.guess.dist config.guess
+endif
+       dh_clean 
+
+install: install-indep install-arch
+install-indep: build-indep-stamp
+       dh_testdir
+       dh_testroot
+       dh_installdirs -i
 
        $(MAKE) -C dialup_admin DIALUP_PREFIX=/usr/share/freeradius-dialupadmin \
-                               DIALUP_DOCDIR=/usr/share/doc/freeradius-dialupadmin \
-                               DIALUP_CONFDIR=/etc/freeradius-dialupadmin \
-                               R=$(freeradius_dir) install
+                               DIALUP_DOCDIR=/usr/share/doc/freeradius-dialupadmin \
+                               DIALUP_CONFDIR=/etc/freeradius-dialupadmin \
+                               R=$(freeradius_dir) install
+
        mv $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/dialup_admin.cron \
-          $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/freeradius-dialupadmin.cron
+              $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/freeradius-dialupadmin.cron
+       mv $(freeradius_dir)/usr/share/doc/freeradius-dialupadmin/Changelog \
+              $(freeradius_dir)/usr/share/doc/freeradius-dialupadmin/changelog
 
-       touch install-indep-stamp
+       install -m0644 debian/apache2.conf $(freeradius_dir)/etc/freeradius-dialupadmin/
 
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch-stamp
+       dh_install -i --sourcedir=$(freeradius_dir)
+       dh_installdocs -p freeradius-dialupadmin dialup_admin/README
+
+install-arch: build-arch-stamp
        dh_testdir
        dh_testroot
-
+       dh_installdirs -s
+       test -d $(freeradius_dir)/usr/lib/freeradius || mkdir -p $(freeradius_dir)/usr/lib/freeradius
+       ln -s rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
        $(MAKE) install R=$(freeradius_dir)
-
-       # Rename radius binary to play nicely with others
+       
+       # rename radius binary to play nicely with others
        mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
        mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
+       
+       dh_install --sourcedir=$(freeradius_dir) -p libfreeradius2
+       dh_install --sourcedir=$(freeradius_dir) -p libfreeradius-dev
 
-       # Clean up after install
-       rm -f $(freeradius_dir)/etc/freeradius/example.pl
-       rm -f $(freeradius_dir)/usr/sbin/rc.radiusd
-       rm -f $(freeradius_dir)/usr/share/doc/freeradius/ChangeLog
-
-       # Install the SNMP MIBs into debian/tmp
-       install -m 755 -d $(freeradius_dir)/usr/share/snmp/mibs
-       install -m 644 mibs/*.txt $(freeradius_dir)/usr/share/snmp/mibs
-
-       touch install-arch-stamp
-
-binary: binary-indep binary-arch
-
-binary-indep: install-indep-stamp
-       dh_testroot
-       #dh_clean -i -k
-       dh_installdirs -i
-       dh_install -XCVS -X.svn -i --sourcedir=debian/tmp
-       dh_installdocs -XCVS -X.svn -i
-       dh_installchangelogs -XCVS -X.svn dialup_admin/Changelog -i
-       dh_installexamples -XCVS -X.svn -i
-       dh_installman -XCVS -X.svn -i
-       dh_link -i
-       dh_perl -i
-       dh_installdeb -i
-       dh_compress -i
-       dh_fixperms -i
-       dh_md5sums -i
-       dh_gencontrol -i
-       dh_builddeb -i
-
-binary-arch: install-arch-stamp
-       dh_testroot
-       #dh_clean -a -k
-       dh_installdirs -a
-       dh_install -XCVS -X.svn -a --sourcedir=debian/tmp
-       # Not nice, but it works; remove modules we package seperately
-       # from the main package
        for mod in ${modulelist}; do \
-               rm -f $(CURDIR)/debian/freeradius/usr/lib/freeradius/rlm_$$mod* ; \
+         pkg=$${mod##sql_} ; \
+         dh_install --sourcedir=$(freeradius_dir) -p freeradius-$$pkg ; \
+         rm -f $(freeradius_dir)/usr/lib/freeradius/rlm_$$mod*.so ; \
        done
-       dh_installdocs -XCVS -X.svn -a
-       dh_installexamples -XCVS -X.svn -a
-       dh_installchangelogs -XCVS -X.svn -a doc/ChangeLog
-       dh_installman -XCVS -X.svn -a
+
+       dh_install --sourcedir=$(freeradius_dir) -p freeradius-utils
+       dh_install --sourcedir=$(freeradius_dir) -p freeradius
+       
        dh_strip -a --dbg-package=freeradius-dbg
-       dh_installlogrotate -a
-       dh_installinit -n -a
-       dh_installpam --name=radiusd -a
-       # We don't need ldconfig. None of our libraries go in it's paths
-       dh_makeshlibs -n -a
-       dh_shlibdeps -a
-ifeq ($(openssl), no)
-       for pkg in $(shell grep ^Package debian/control | awk '{print $$2}') ; do \
-               if dh_shlibdeps -p $$pkg -- -O | grep -q libssl; then \
-                       echo "$$pkg links to openssl" ; \
-                       exit 1 ; \
-               fi ; \
+
+       dh_makeshlibs -a -n
+       for pkg in ${pkgs} ; do \
+         if dh_shlibdeps -p $$pkg -- -O 2>/dev/null | grep -q libssl; then \
+           echo "$$pkg links to openssl" ;\
+           exit 1 ;\
+         fi ;\
        done
-endif
-       dh_installdeb -a
-       dh_compress -a
-       dh_fixperms -a
-       dh_md5sums -a
-       dh_gencontrol -a
-       dh_builddeb -a
+       dh_shlibdeps
 
-clean: unpatch
+binary-common:
        dh_testdir
-       dh_clean
-       rm -f build-arch-stamp build-indep-stamp libltdl/stamp-h1
-       rm -f install-arch-stamp install-indep-stamp configure-stamp
-
-       [ -f Make.inc ] && make distclean || true
-       # The make clean forgets to remove this build directory
-       [ -d src/modules/lib ] && rm -fr src/modules/lib || true
-
-       # Put the original autotools files back in place
-       [ -f config.sub.dist ] && rm config.sub && mv config.sub.dist config.sub || true
-       [ -f config.guess.dist ] && rm config.guess && mv config.guess.dist config.guess || true
-
-.PHONY: build build-indep build-arch install install-indep install-arch binary binary-arch binary-indep clean
+       dh_testroot
+       dh_installchangelogs 
+       dh_installdocs
+       dh_installexamples
+       chmod -x debian/freeradius/usr/share/doc/freeradius/examples/example.pl
+       dh_installlogrotate     
+       dh_installpam --name=radiusd 
+       dh_installinit --noscripts
+       dh_installman
+       dh_lintian
+       dh_link
+       dh_compress -Xexamples
+       dh_fixperms
+       dh_installdeb
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch