diff --git a/debian/Makefile.am b/debian/Makefile.am index 7ecd7790..2eaaa448 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -10,11 +10,3 @@ # AUTOMAKE_OPTIONS = foreign - -EXTRA_DIST = README.debian changelog conffiles control copyright dirs \ - docs examples files libradius-ng-dev.dirs libradius-ng-dev.files \ - libradius-ng.conffiles libradius-ng.dirs libradius-ng.files \ - libradius-ng.postinst libradius-ng.substvars postrm \ - radiusclient-ng.dirs radiusclient-ng.files \ - radiusclient-ng.postinst rules substvars watch - diff --git a/debian/README.debian b/debian/README.debian deleted file mode 100644 index 3e57867f..00000000 --- a/debian/README.debian +++ /dev/null @@ -1,19 +0,0 @@ -radiusclient-ng for DEBIAN --------------------------- - -Radiusclient is a /bin/login replacement which gets called by a getty -to log in a user and to setup the user's login environment. Normal -login programs just check the login name and password which the user -entered against the local password file (/etc/passwd, /etc/shadow). In -contrast to that Radiusclient also uses the RADIUS protocol to -authenticate the user. - -radiusclient-ng is a version with enhanced API in the libradiusclient -library by Maxim Sobolev - -Please view /usr/doc/radiusclient-ng/instop.html with your favourite WWW -browser, e.g lynx or netscape. - -Config files are in /etc/radiusclient-ng. - -Jan Janak , Mon, 15 Nov 2004 12:20:42 +0100 diff --git a/debian/changelog b/debian/changelog index 342346d6..94aab6ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -radiusclient-ng (0.5.0) unstable; urgency=low +freeradius-client2 (1.1.7~1) unstable; urgency=low * New upstream release - -- Jan Janak Mon, 23 May 2005 20:37:22 +0200 + -- s3rj1k Thu, 27 Sep 2018 20:37:22 +0200 -radiusclient-ng (0.4.8) unstable; urgency=low +freeradius-client2 (1.1.7~0) unstable; urgency=low - * Initial Release. + * Stub release. - -- Jan Janak Mon, 15 Nov 2004 12:20:43 +0100 + -- s3rj1k Thu, 27 Sep 2018 20:00:00 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index 63e04a17..00000000 --- a/debian/conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/etc/radiusclient-ng/issue -/etc/radiusclient-ng/port-id-map -/etc/radiusclient-ng/servers diff --git a/debian/control b/debian/control index d2af9a20..e8780b46 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,14 @@ -Source: radiusclient-ng +Source: freeradius-client2 Section: admin Priority: extra -Maintainer: Jan Janak +Maintainer: s3rj1k Build-Depends: debhelper, libtool Standards-Version: 3.5.2 -Package: radiusclient-ng +Package: freeradius-client2 Architecture: any Section: admin -Depends: libradius-ng, perl5, ${shlibs:Depends} -Conflicts: radiusclient1 +Depends: libradius, perl5, ${shlibs:Depends} Description: /bin/login replacement which uses the RADIUS protocol for authentication. Radiusclient is a /bin/login replacement which gets called by a getty to log in a user and to setup the user's login environment. Normal @@ -17,16 +16,12 @@ Description: /bin/login replacement which uses the RADIUS protocol for authentic entered against the local password file (/etc/passwd, /etc/shadow). In contrast to that Radiusclient also uses the RADIUS protocol to authenticate the user. - . - The "-ng" version of libradiusclient contains enhanced API made by - Maxim Sobolev - . This is the main binary archive. -Package: libradius-ng-dev +Package: libfreeradius-client2-dev Architecture: any Section: libdevel -Depends: libradius-ng, libc6-dev +Depends: libfreeradius-client2, libc6-dev Description: /bin/login replacement with RADIUS. Header file and link lib. Radiusclient is a /bin/login replacement which gets called by a getty to log in a user and to setup the user's login environment. Normal @@ -35,13 +30,10 @@ Description: /bin/login replacement with RADIUS. Header file and link lib. In contrast to that Radiusclient also uses the RADIUS protocol to authenticate the user. . - The "-ng" version of libradiusclient contains enhanced API made by - Maxim Sobolev - . This is the development package, to be able to develop programs that uses the RADIUS library. -Package: libradius-ng +Package: libfreeradius-client2 Architecture: any Section: libs Depends: ${shlibs:Depends} @@ -53,7 +45,4 @@ Description: /bin/login replacement with RADIUS. Shared lib to used by programs. contrast to that Radiusclient also uses the RADIUS protocol to authenticate the user. . - The "-ng" version of libradiusclient contains enhanced API made by - Maxim Sobolev - . This is the libraries needed by any client needing the RADIUS protocol. diff --git a/debian/copyright b/debian/copyright index f5637d64..c1062f40 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -This package was debianized by Jan Janak on -Mon, 15 Nov 2004 12:20:42 +0100. +This package was debianized by s3rj1k on +Thu, 27 May 2018 20:37:22 +0200. The debian package files have been derived from the original radiusclient1 debian package. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index d463a2ac..00000000 --- a/debian/dirs +++ /dev/null @@ -1,6 +0,0 @@ -etc/radiusclient-ng -usr/sbin - -usr/lib -usr/include -usr/man/man3 diff --git a/debian/docs b/debian/docs index e3773eb1..f95a22a9 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -BUGS README README.radexample doc/instop.html +BUGS README.rst README.radexample doc/instop.html diff --git a/debian/files b/debian/files deleted file mode 100644 index a59ae983..00000000 --- a/debian/files +++ /dev/null @@ -1,3 +0,0 @@ -radiusclient-ng_0.5.1_i386.deb admin extra -libradius-ng-dev_0.5.1_i386.deb libdevel extra -libradius-ng_0.5.1_i386.deb libs extra diff --git a/debian/freeradius-client2.install b/debian/freeradius-client2.install new file mode 100644 index 00000000..cd555945 --- /dev/null +++ b/debian/freeradius-client2.install @@ -0,0 +1,2 @@ +etc/radiusclient/* +usr/sbin/* diff --git a/debian/freeradius-client2.lintian-overrides b/debian/freeradius-client2.lintian-overrides new file mode 100644 index 00000000..45ccca03 --- /dev/null +++ b/debian/freeradius-client2.lintian-overrides @@ -0,0 +1,12 @@ +# upstream does not provide changelog +freeradius-client2: debian-changelog-file-missing-or-wrong-name +# we do use helper template +freeradius-client2: helper-templates-in-copyright +# upstream does not provide man pages +freeradius-client2: binary-without-manpage usr/sbin/login.radius +freeradius-client2: binary-without-manpage usr/sbin/radacct +freeradius-client2: binary-without-manpage usr/sbin/radembedded +freeradius-client2: binary-without-manpage usr/sbin/radexample +freeradius-client2: binary-without-manpage usr/sbin/radiusclient +freeradius-client2: binary-without-manpage usr/sbin/radlogin +freeradius-client2: binary-without-manpage usr/sbin/radstatus diff --git a/debian/libfreeradius-client2-dev.install b/debian/libfreeradius-client2-dev.install new file mode 100644 index 00000000..e90a031d --- /dev/null +++ b/debian/libfreeradius-client2-dev.install @@ -0,0 +1,4 @@ +usr/include/*.h +usr/lib/*/*.a +usr/lib/*/*.la + diff --git a/debian/libfreeradius-client2-dev.lintian-overrides b/debian/libfreeradius-client2-dev.lintian-overrides new file mode 100644 index 00000000..71b7c367 --- /dev/null +++ b/debian/libfreeradius-client2-dev.lintian-overrides @@ -0,0 +1,4 @@ +# upstream does not provide changelog +libfreeradius-client2-dev: debian-changelog-file-missing-or-wrong-name +# we do use helper template +libfreeradius-client2-dev: helper-templates-in-copyright diff --git a/debian/libfreeradius-client2.install b/debian/libfreeradius-client2.install new file mode 100644 index 00000000..3de3b10a --- /dev/null +++ b/debian/libfreeradius-client2.install @@ -0,0 +1 @@ +usr/lib/*/*.so.* diff --git a/debian/libfreeradius-client2.lintian-overrides b/debian/libfreeradius-client2.lintian-overrides new file mode 100644 index 00000000..75526f68 --- /dev/null +++ b/debian/libfreeradius-client2.lintian-overrides @@ -0,0 +1,4 @@ +# upstream does not provide changelog +libfreeradius-client2: debian-changelog-file-missing-or-wrong-name +# we do use helper template +libfreeradius-client2: helper-templates-in-copyright diff --git a/debian/libradius-ng-dev.dirs b/debian/libradius-ng-dev.dirs deleted file mode 100644 index 44188162..00000000 --- a/debian/libradius-ng-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libradius-ng-dev.files b/debian/libradius-ng-dev.files deleted file mode 100644 index 86d402f8..00000000 --- a/debian/libradius-ng-dev.files +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/freeradius-client.h -usr/lib/libradiusclient-ng.la -usr/lib/libradiusclient-ng.a - diff --git a/debian/libradius-ng.conffiles b/debian/libradius-ng.conffiles deleted file mode 100644 index 3711ce41..00000000 --- a/debian/libradius-ng.conffiles +++ /dev/null @@ -1,5 +0,0 @@ -/etc/radiusclient-ng/radiusclient.conf -/etc/radiusclient-ng/dictionary -/etc/radiusclient-ng/dictionary.ascend -/etc/radiusclient-ng/dictionary.compat -/etc/radiusclient-ng/dictionary.merit diff --git a/debian/libradius-ng.dirs b/debian/libradius-ng.dirs deleted file mode 100644 index 7102b716..00000000 --- a/debian/libradius-ng.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/radiusclient-ng -usr/lib diff --git a/debian/libradius-ng.files b/debian/libradius-ng.files deleted file mode 100644 index 49cc562b..00000000 --- a/debian/libradius-ng.files +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*.so.* diff --git a/debian/libradius-ng.postinst b/debian/libradius-ng.postinst deleted file mode 100644 index fee41f31..00000000 --- a/debian/libradius-ng.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ]; then - # Call ldconfig - ldconfig -fi - -#DEBHELPER# diff --git a/debian/libradius-ng.substvars b/debian/libradius-ng.substvars deleted file mode 100644 index b7d60550..00000000 --- a/debian/libradius-ng.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.3.2.ds1-4) diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index a2c66fa2..00000000 --- a/debian/postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -#DEBHELPER# diff --git a/debian/radiusclient-ng.dirs b/debian/radiusclient-ng.dirs deleted file mode 100644 index 6006d8c3..00000000 --- a/debian/radiusclient-ng.dirs +++ /dev/null @@ -1,2 +0,0 @@ -etc/radiusclient-ng -usr/sbin diff --git a/debian/radiusclient-ng.files b/debian/radiusclient-ng.files deleted file mode 100644 index 2588e731..00000000 --- a/debian/radiusclient-ng.files +++ /dev/null @@ -1,9 +0,0 @@ -etc/radiusclient-ng/issue -etc/radiusclient-ng/port-id-map -etc/radiusclient-ng/radiusclient.conf -etc/radiusclient-ng/servers -usr/sbin/radlogin -usr/sbin/radstatus -usr/sbin/radacct -usr/sbin/radexample -usr/sbin/login.radius diff --git a/debian/radiusclient-ng.postinst b/debian/radiusclient-ng.postinst deleted file mode 100644 index e6b71cb3..00000000 --- a/debian/radiusclient-ng.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ -d /usr/doc -a ! -e /usr/doc/radiusclient-ng -a -d /usr/share/doc/radiusclient-ng ]; then - ln -sf ../share/doc/radiusclient-ng /usr/doc/radiusclient-ng -fi - -chmod 600 /etc/radiusclient-ng/servers - -#DEBHELPER# diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 4960a2df..1f58dddb --- a/debian/rules +++ b/debian/rules @@ -1,113 +1,24 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# This version is for a hypothetical package that builds an -# architecture-dependant package, as well as an architecture-independant -# package. +# -*- makefile -*- -package=radiusclient-ng +# get debian distribution codename +DISTRIBUTION=$(shell lsb_release -sc) +# get version from changelog, for string mangling +VERSION=$(shell dpkg-parsechangelog --count 1 --show-field Version) +# add distribution codename to package version +PACKAGEVERSION=$(subst ~,~$(DISTRIBUTION)-,$(VERSION)) -version=$(shell expr `pwd` : '.*-\([0-9.]*\)') -version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*') -version_so=2.0.0 +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 -topdir=$(shell pwd) +# enable dpkg build flags +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -build: build-stamp -build-stamp: - dh_testdir - - @( \ - for link in config.guess config.sub ltmain.sh missing mkinstalldirs; do \ - ln -s /usr/share/libtool/$$link $$link; \ - done; \ - ) - - ./configure --prefix=/usr --sysconfdir=/etc --enable-shadow - - rm -f libtool - ln -s /usr/bin/libtool libtool - - make - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - -rm -rf static shared - @( \ - for link in config.guess config.sub ltmain.sh missing mkinstalldirs; do \ - rm -f $$link; \ - done; \ - ) - - # Add here commands to clean up after the build process. - -$(MAKE) distclean - - dh_clean - -dirs: - dh_installdirs - - dh_testdir - dh_testroot - - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installmanpages - dh_undocumented login.radius.1 radacct.1 radexample.1 radlogin.1 radstatus.1 - dh_installchangelogs - -binary-arch: dirs radiusclient-ng libradius-ng libradius-ng-dev - dh_installdeb - - dh_strip - dh_compress - dh_fixperms - - dh_shlibdeps - dh_gencontrol - dh_makeshlibs -m$(version_so) - dh_md5sums - - chmod 600 $(topdir)/debian/tmp/etc/radiusclient-ng/servers - dh_builddeb - -radiusclient-ng: build - for file in radacct radexample radlogin radstatus; do \ - install -m755 $(topdir)/src/.libs/$$file $(topdir)/debian/tmp/usr/sbin; \ - done - install -m755 $(topdir)/login.radius/migs/login.radius $(topdir)/debian/tmp/usr/sbin - for file in issue port-id-map servers; do \ - install -m644 $(topdir)/etc/$$file $(topdir)/debian/tmp/etc/radiusclient-ng; \ - done - -libradius-ng: build - install -m755 $(topdir)/lib/.libs/libfreeradius-client.so.$(version_so) debian/libradius-ng/usr/lib - for file in radiusclient.conf dictionary dictionary.ascend dictionary.compat dictionary.merit; do \ - install -m644 $(topdir)/etc/$$file $(topdir)/debian/libradius-ng/etc/radiusclient-ng; \ - done - cd debian/libradius-ng/usr/lib && ln -s libfreeradius-client.so.$(version_so) libfreeradius-client.so.2 - -libradius-ng-dev: build - install -m644 $(topdir)/include/freeradius-client.h $(topdir)/debian/libradius-ng-dev/usr/include - install -m644 $(topdir)/lib/.libs/libfreeradius-client.a $(topdir)/debian/libradius-ng-dev/usr/lib - install -m644 $(topdir)/lib/libfreeradius-client.la $(topdir)/debian/libradius-ng-dev/usr/lib - cd debian/libradius-ng-dev/usr/lib && ln -s libfreeradius-client.so.$(version_so) libfreeradius-client.so - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-arch -.PHONY: build clean binary-arch binary radiusclient-ng libradius-ng-dev - -# Local variables: -# mode: Makefile -# End: +# setting mangled package version +override_dh_gencontrol: + dh_gencontrol -- -v$(PACKAGEVERSION) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/substvars b/debian/substvars deleted file mode 100644 index b7d60550..00000000 --- a/debian/substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.3.2.ds1-4) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 5feac544..00000000 --- a/debian/watch +++ /dev/null @@ -1,5 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -ftp.cityline.net /pub/radiusclient radiusclient-*.tar.gz debian uupdate