On Sun, 2004-04-18 at 12:33, Jerome Warnier wrote:
> On Sun, 2004-04-18 at 05:43, Paul Hampson wrote:
> > On Sat, Apr 17, 2004 at 11:41:27PM +0200, Jerome Warnier wrote:
> > > On Sat, 2004-04-17 at 06:02, Paul Hampson wrote:
> > > > On Fri, Apr 16, 2004 at 09:55:01PM +0200, Jerome Warnier wrote:
> > > > > On Fri, 2004-04-16 at 20:42, Alan DeKok wrote:
> > > > > > ?ISO-8859-1?Q?J=E9r=F4me?= Warnier <[EMAIL PROTECTED]> wrote:
> > > > > > ...
> > > > > >
> > > > > > Try the latest CVS snapshot, it may work better there.
> > > > > My first remarks:
> > > > > I was surprised to find the dialup-admin as a Debian package. Though, it
> > > > > is completely broken. The files are not where they should, and are not
> > > > > even copied at all.
> > > > > $ dpkg -L freeradius-dialupadmin
> > > > > /.
> > > > > /usr
> > > > > /usr/share
> > > > > /usr/share/dialupadmin
> > > > > /usr/share/doc
> > > > > /usr/share/doc/dialupadmin
> > > > > /usr/share/doc/freeradius-dialupadmin
> > > > > /usr/share/doc/freeradius-dialupadmin/README.Debian
> > > > > /usr/share/doc/freeradius-dialupadmin/copyright
> > > > > /usr/share/doc/freeradius-dialupadmin/changelog.gz
> > > > > /usr/share/doc/freeradius-dialupadmin/README.gz
> > > > > /usr/share/doc/freeradius-dialupadmin/changelog.Debian.gz
> > > > > /dialup_admin
> > > > > /dialup_admin/conf
> > > > > /dialup_admin/conf/accounting.attrs
> > > > > /dialup_admin/conf/admin.conf
> > > > > /dialup_admin/conf/auth.request
> > > > > /dialup_admin/conf/captions.conf
> > > > > /dialup_admin/conf/config.php3
> > > > > /dialup_admin/conf/CVS
> > > > > /dialup_admin/conf/default.vals
> > > > > /dialup_admin/conf/extra.ldap-attrmap
> > > > > /dialup_admin/conf/naslist.conf
> > > > > /dialup_admin/conf/sql.attrmap
> > > > > /dialup_admin/conf/sql.attrs
> > > > > /dialup_admin/conf/user_edit.attrs
> > > > > /dialup_admin/conf/username.mappings
> > > > > /dialup_admin/bin
> > > > > /dialup_admin/Changelog
> > > > > /dialup_admin/CVS
> > > > > /dialup_admin/doc
> > > > > /dialup_admin/htdocs
> > > > > /dialup_admin/html
> > > > > /dialup_admin/lib
> > > > > /dialup_admin/README
> > > > > /dialup_admin/sql
> > > > > /etc
> > > > > /etc/freeradius-dialupadmin
> > > > > /usr/share/dialupadmin/conf
> >
> > > > Hmm, that's interesting. I _thought_ it worked when I did it here...
> > > > I'll have another look now, and see what I did wrong... The directories
> > > > are right, the files just didn't go _into_ them. :-(
> >
> > I must have been looking none to closely... it was indeed incorrect
> > here.
> >
> > > The /dialup_admin/* are wrong, indeed.
> >
> > OK, that was easily fixed. Replace dh_installdirs with dh_install. I've
> > just comitted that to CVS.
>
> I guess the dependencies for the freeradius-dialupadmin package are not
> correct either. Here is a suggested fix for it:
> Depends: apache | httpd, php4 | php4-cgi, php4-pear, ${perl:Depends}
>
> And you have of course to use dh_perl in debian/rules to substitute the
> ${perl:Depends}. I suggest the following (not tested):
> dh_perl -p freeradius-dialupadmin dialup_admin/bin
Please find here-attached my fixed debian/rules.
It seems to work, though there is still a problem because "conf" gets
copied *under* /etc/freeradius-dialupadmin.
[EMAIL PROTECTED]:~/debian$ dpkg -L freeradius-dialupadmin
/.
/etc
/etc/freeradius-dialupadmin
/etc/freeradius-dialupadmin/conf
/etc/freeradius-dialupadmin/conf/accounting.attrs
/etc/freeradius-dialupadmin/conf/admin.conf
/etc/freeradius-dialupadmin/conf/auth.request
/etc/freeradius-dialupadmin/conf/captions.conf
/etc/freeradius-dialupadmin/conf/config.php3
/etc/freeradius-dialupadmin/conf/default.vals
/etc/freeradius-dialupadmin/conf/extra.ldap-attrmap
/etc/freeradius-dialupadmin/conf/naslist.conf
/etc/freeradius-dialupadmin/conf/sql.attrmap
/etc/freeradius-dialupadmin/conf/sql.attrs
/etc/freeradius-dialupadmin/conf/user_edit.attrs
/etc/freeradius-dialupadmin/conf/username.mappings
/usr
/usr/share
/usr/share/dialupadmin
/usr/share/dialupadmin/bin
/usr/share/dialupadmin/bin/clean_radacct
/usr/share/dialupadmin/bin/dialup_admin.cron
/usr/share/dialupadmin/bin/log_badlogins
/usr/share/dialupadmin/bin/monthly_tot_stats
/usr/share/dialupadmin/bin/showmodem
/usr/share/dialupadmin/bin/snmpfinger
/usr/share/dialupadmin/bin/tot_stats
/usr/share/dialupadmin/bin/truncate_radacct
/usr/share/dialupadmin/doc
/usr/share/dialupadmin/doc/AUTHORS
/usr/share/dialupadmin/doc/FAQ
/usr/share/dialupadmin/doc/HELP_WANTED
/usr/share/dialupadmin/doc/HOWTO
/usr/share/dialupadmin/doc/TODO
/usr/share/dialupadmin/htdocs
/usr/share/dialupadmin/htdocs/about.html
/usr/share/dialupadmin/htdocs/accounting.php3
/usr/share/dialupadmin/htdocs/badusers.php3
/usr/share/dialupadmin/htdocs/buttons.php3
/usr/share/dialupadmin/htdocs/clear_opensessions.php3
/usr/share/dialupadmin/htdocs/content.html
/usr/share/dialupadmin/htdocs/failed_logins.php3
/usr/share/dialupadmin/htdocs/find.php3
/usr/share/dialupadmin/htdocs/group_admin.php3
/usr/share/dialupadmin/htdocs/group_new.php3
/usr/share/dialupadmin/htdocs/index.html
/usr/share/dialupadmin/htdocs/login_time_create.php3
/usr/share/dialupadmin/htdocs/password.php3
/usr/share/dialupadmin/htdocs/password_generator.jsc
/usr/share/dialupadmin/htdocs/session_destroy.php3
/usr/share/dialupadmin/htdocs/show_groups.php3
/usr/share/dialupadmin/htdocs/stats.php3
/usr/share/dialupadmin/htdocs/style.css
/usr/share/dialupadmin/htdocs/help
/usr/share/dialupadmin/htdocs/help/auth_type_help.html
/usr/share/dialupadmin/htdocs/help/badusers_help.html
/usr/share/dialupadmin/htdocs/help/callback_id_help.html
/usr/share/dialupadmin/htdocs/help/callback_number_help.html
/usr/share/dialupadmin/htdocs/help/class_help.html
/usr/share/dialupadmin/htdocs/help/dialup_access_help.html
/usr/share/dialupadmin/htdocs/help/expiration_help.html
/usr/share/dialupadmin/htdocs/help/filter_id_help.html
/usr/share/dialupadmin/htdocs/help/framed_compression_help.html
/usr/share/dialupadmin/htdocs/help/framed_ip_address_help.html
/usr/share/dialupadmin/htdocs/help/framed_ip_netmask_help.html
/usr/share/dialupadmin/htdocs/help/framed_mtu_help.html
/usr/share/dialupadmin/htdocs/help/framed_protocol_help.html
/usr/share/dialupadmin/htdocs/help/help.php3
/usr/share/dialupadmin/htdocs/help/idle_timeout_help.html
/usr/share/dialupadmin/htdocs/help/lock_message_help.html
/usr/share/dialupadmin/htdocs/help/login_time_help.html
/usr/share/dialupadmin/htdocs/help/port_limit_help.html
/usr/share/dialupadmin/htdocs/help/reply_message_help.html
/usr/share/dialupadmin/htdocs/help/service_type_help.html
/usr/share/dialupadmin/htdocs/help/session_timeout_help.html
/usr/share/dialupadmin/htdocs/help/simultaneous_use_help.html
/usr/share/dialupadmin/htdocs/help/nomadix
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_bw_down_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_bw_up_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_config_url_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_endofsession_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_expiration_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_ip_upsell_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_logoff_url_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_maxbytesdown_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_maxbytesup_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_subnet_help.html
/usr/share/dialupadmin/htdocs/help/nomadix/nomadix_url_redirection_help.html
/usr/share/dialupadmin/htdocs/user_accounting.php3
/usr/share/dialupadmin/htdocs/user_admin.php3
/usr/share/dialupadmin/htdocs/user_delete.php3
/usr/share/dialupadmin/htdocs/user_edit.php3
/usr/share/dialupadmin/htdocs/user_finger.php3
/usr/share/dialupadmin/htdocs/user_info.php3
/usr/share/dialupadmin/htdocs/user_new.php3
/usr/share/dialupadmin/htdocs/user_state.php3
/usr/share/dialupadmin/htdocs/user_stats.php3
/usr/share/dialupadmin/htdocs/user_test.php3
/usr/share/dialupadmin/htdocs/images
/usr/share/dialupadmin/htdocs/images/arrow.gif
/usr/share/dialupadmin/htdocs/images/bg.gif
/usr/share/dialupadmin/htdocs/images/black.gif
/usr/share/dialupadmin/htdocs/images/greenlines1.gif
/usr/share/dialupadmin/htdocs/images/logo2.gif
/usr/share/dialupadmin/htdocs/images/pixel.gif
/usr/share/dialupadmin/htdocs/images/title2.gif
/usr/share/dialupadmin/html
/usr/share/dialupadmin/html/group_toolbar.html.php3
/usr/share/dialupadmin/html/stats.html.php3
/usr/share/dialupadmin/html/user_admin.html.php3
/usr/share/dialupadmin/html/user_admin_userinfo.html.php3
/usr/share/dialupadmin/html/user_toolbar.html.php3
/usr/share/dialupadmin/html/buttons
/usr/share/dialupadmin/html/buttons/default
/usr/share/dialupadmin/html/buttons/default/buttons.html.php3
/usr/share/dialupadmin/lib
/usr/share/dialupadmin/lib/acctshow.php3
/usr/share/dialupadmin/lib/add_badusers.php3
/usr/share/dialupadmin/lib/attrshow.php3
/usr/share/dialupadmin/lib/defaults.php3
/usr/share/dialupadmin/lib/functions.php3
/usr/share/dialupadmin/lib/operators.php3
/usr/share/dialupadmin/lib/crypt
/usr/share/dialupadmin/lib/crypt/clear.php3
/usr/share/dialupadmin/lib/crypt/crypt.php3
/usr/share/dialupadmin/lib/crypt/md5.php3
/usr/share/dialupadmin/lib/lang
/usr/share/dialupadmin/lib/lang/default
/usr/share/dialupadmin/lib/lang/default/utf8.php3
/usr/share/dialupadmin/lib/lang/el
/usr/share/dialupadmin/lib/lang/el/utf8.php3
/usr/share/dialupadmin/lib/ldap
/usr/share/dialupadmin/lib/ldap/attrmap.php3
/usr/share/dialupadmin/lib/ldap/change_attrs.php3
/usr/share/dialupadmin/lib/ldap/change_info.php3
/usr/share/dialupadmin/lib/ldap/change_passwd.php3
/usr/share/dialupadmin/lib/ldap/create_user.php3
/usr/share/dialupadmin/lib/ldap/defaults.php3
/usr/share/dialupadmin/lib/ldap/delete_user.php3
/usr/share/dialupadmin/lib/ldap/find.php3
/usr/share/dialupadmin/lib/ldap/functions.php3
/usr/share/dialupadmin/lib/ldap/password_check.php3
/usr/share/dialupadmin/lib/ldap/personattrs.php3
/usr/share/dialupadmin/lib/ldap/user_info.php3
/usr/share/dialupadmin/lib/sql
/usr/share/dialupadmin/lib/sql/attrmap.php3
/usr/share/dialupadmin/lib/sql/change_attrs.php3
/usr/share/dialupadmin/lib/sql/change_info.php3
/usr/share/dialupadmin/lib/sql/change_passwd.php3
/usr/share/dialupadmin/lib/sql/create_group.php3
/usr/share/dialupadmin/lib/sql/create_user.php3
/usr/share/dialupadmin/lib/sql/defaults.php3
/usr/share/dialupadmin/lib/sql/delete_group.php3
/usr/share/dialupadmin/lib/sql/delete_user.php3
/usr/share/dialupadmin/lib/sql/find.php3
/usr/share/dialupadmin/lib/sql/functions.php3
/usr/share/dialupadmin/lib/sql/group_admin.php3
/usr/share/dialupadmin/lib/sql/group_info.php3
/usr/share/dialupadmin/lib/sql/password_check.php3
/usr/share/dialupadmin/lib/sql/user_info.php3
/usr/share/dialupadmin/lib/sql/drivers
/usr/share/dialupadmin/lib/sql/drivers/mysql
/usr/share/dialupadmin/lib/sql/drivers/mysql/functions.php3
/usr/share/dialupadmin/lib/sql/drivers/pg
/usr/share/dialupadmin/lib/sql/drivers/pg/functions.php3
/usr/share/dialupadmin/sql
/usr/share/dialupadmin/sql/badusers.sql
/usr/share/dialupadmin/sql/mtotacct.sql
/usr/share/dialupadmin/sql/totacct.sql
/usr/share/dialupadmin/sql/userinfo.sql
/usr/share/doc
/usr/share/doc/freeradius-dialupadmin
/usr/share/doc/freeradius-dialupadmin/README.Debian
/usr/share/doc/freeradius-dialupadmin/copyright
/usr/share/doc/freeradius-dialupadmin/changelog.gz
/usr/share/doc/freeradius-dialupadmin/README.gz
/usr/share/doc/freeradius-dialupadmin/changelog.Debian.gz
/usr/share/dialupadmin/conf
> > > > > I'm going to submit a patch soon because I'd like to see how this one
> > > > > runs.
> > > I'm still struggling with this, but have yet fixed several things.
--
Jerome Warnier <[EMAIL PROTECTED]>
BeezNest s.a r.l.
#! /usr/bin/make -f
#
# debian/rules file for freeradius
#
SHELL =/bin/bash
package = freeradius
debiandir = $(shell pwd)/debian
freeradius_dir = $(debiandir)/$(package)
mandir = /usr/share/man
libdir = /usr/lib/$(package)
logdir = /var/log/$(package)
pkgdocdir = /usr/share/doc/$(package)
raddbdir = /etc/$(package)
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
# Autoconf 2.13 arch support
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += $(DEB_HOST_GNU_TYPE)
else
confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
endif
build-simple stamp-build:
dh_testdir
# dh_testroot
./configure \
$(confflags) \
--prefix=/usr \
--exec-prefix=/usr \
--mandir=$(mandir) \
--sysconfdir=/etc \
--libdir=$(libdir) \
--datadir=/usr/share \
--localstatedir=/var \
--with-raddbdir=$(raddbdir) \
--with-logdir=/var/log/$(package) \
--with-thread-pool --with-system-libtool \
--enable-ltdl-install=no --enable-strict-dependencies \
--enable-developer
# Modify Make.inc for Debian...
TEMPFILE=`mktemp /tmp/radmake-XXXXXX`; \
cp Make.inc $$TEMPFILE; \
cat $$TEMPFILE \
| sed -e
's!${localstatedir}/run/radiusd!${localstatedir}/run/freeradius!' \
> Make.inc; \
rm $$TEMPFILE
make
touch stamp-build
build: autotools build-simple
binary-indep: stamp-build
binary-arch: stamp-build
dh_testroot
dh_clean
dh_installdirs
make install R=$(freeradius_dir)
# rename radius binary to play nicely with others
mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
# clean up install cruft. $$&@!%
rm $(freeradius_dir)/usr/sbin/rc.radiusd
test ! -d $(freeradius_dir)/etc/raddb || rmdir $(freeradius_dir)/etc/raddb
test ! -d $(freeradius_dir)/var/log/radius/radacct || rmdir
$(freeradius_dir)/var/log/radius/radacct
test ! -d $(freeradius_dir)/var/log/radius || rmdir
$(freeradius_dir)/var/log/radius
# Yuck! the makefile in doc/ does this.
rm -rf $(freeradius_dir)/usr/share/doc/freeradius-1.0.0-pre0
# split out inconvenient/controversal modules to other places
for modname in krb5 ldap mysql postgresql iodbc; do \
mkdir -p $(debiandir)/$(package)-$${modname}/$(libdir); \
mv $(freeradius_dir)/$(libdir)/rlm*_$${modname}*
$(debiandir)/$(package)-$${modname}/$(libdir)/; \
done
# man pages & docs
install -g root -m 644 CREDITS $(freeradius_dir)/$(pkgdocdir)/credits
dh_installdocs -XChangeLog -X00-OLD -XCVS -XMakefile doc/*
dh_installexamples -XCVS `find src/modules/rlm_sql/drivers -type f -name
\*.sql`
dh_installchangelogs doc/ChangeLog
#Rename manpage to go with binary
mv $(freeradius_dir)/$(mandir)/man8/radiusd.8
$(freeradius_dir)/$(mandir)/man8/$(package).8
# SNMP mibs
install -g root -m 644 mibs/*.txt $(freeradius_dir)/usr/share/snmp/mibs
# supporting programs
TEMPFILE=`mktemp /tmp/radconf-XXXXXX`; \
cp $(freeradius_dir)/$(raddbdir)/radiusd.conf $$TEMPFILE; \
cat $$TEMPFILE \
| sed -e 's/ / /g' \
-e '/^ example {/,/^ }/s/^/#/' \
-e 's/# shadow = /shadow = /' \
-e 's/^#\?group = nobody/group = freerad/' \
-e 's/^#\?user = nobody/user = freerad/' \
-e 's!/run/radiusd!/run/freeradius!' \
-e 's!radiusd.pid!freeradius.pid!' \
> $(freeradius_dir)/$(raddbdir)/radiusd.conf; \
rm $$TEMPFILE
# Dialup-Admin
dh_installdocs -p freeradius-dialupadmin $(CURDIR)/dialup_admin/README
dh_installchangelogs -p freeradius-dialupadmin $(CURDIR)/dialup_admin/Changelog
dh_install -p freeradius-dialupadmin -XCVS dialup_admin/conf/
etc/freeradius-dialupadmin/
dh_install -p freeradius-dialupadmin -XCVS -XChangelog -XREADME -Xconf/
dialup_admin/* usr/share/dialupadmin/
dh_link -p freeradius-dialupadmin etc/freeradius-dialupadmin/
usr/share/dialupadmin/conf
dh_perl -p freeradius-dialupadmin dialup_admin/bin/*
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
endif
dh_installlogrotate
dh_installinit -n
dh_installpam --name=radiusd
# We don't need ldconfig. None of our libraries go in it's paths
dh_makeshlibs -n
dh_shlibdeps
dh_installdeb
dh_compress
dh_fixperms
dh_md5sums
dh_gencontrol
dh_builddeb
clean:
dh_testdir
rm -f stamp-build debian/{files,substvars} debian/*.debhelper libltdl/stamp-h1
[ -f Make.inc ] && make distclean || true
dh_clean
rm -rf $(freeradius_dir)
$(debiandir)/$(package)-{krb5,ldap,mysql,postgresql,iodbc}{,.substvars}
[ -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
binary: binary-indep binary-arch
# The autotools target adds forced build-time dependencies on
# autotools-dev (for /usr/share/misc/config.*)
# It's also a .PHONY make target.
autotools:
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
ln -s /usr/share/misc/config.sub config.sub
ln -s /usr/share/misc/config.guess config.guess
# for the maintainer only
sanitycheck:
@echo -n "sanity: checking for overzealous undocumented file... "
@find man/ -type f |grep \. |sed -e 's%man/man./%%' | { \
while read manpage; do \
grep $$manpage debian/$(package).undocumented | read filename
&& echo -n $$filename; \
done; \
} || true
@test -n $$filename
@echo good.
.PHONY: binary binary-arch binary-indep clean sanitycheck autotools
