renamed ebuild to correct version, fixing activefilter issue, adding mschap support...

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index aedbb8e289dd456fdd971508a423c925ca004972..f1e1f27de402dada7b537ab650fdd233a04a49e5 100644 (file)
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.45 2005/09/03 20:56:26 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.46 2005/09/05 22:07:17 sbriesen Exp $
+
+*isdn4k-utils-3.8_pre20050821 (05 Sep 2005)
+
+  05 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  -files/config-3.7_pre20050821, +files/config-3.8_pre20050821,
+  -isdn4k-utils-3.7_pre20050821.ebuild,
+  +isdn4k-utils-3.8_pre20050821.ebuild:
+  renamed ebuild to correct version, fixing activefilter issue, adding mschap
+  support for ipppd, disabled kernel-config checks for the time being (needs
+  rework). see bug 99190.
 
 *isdn4k-utils-3.7_pre20050821 (03 Sep 2005)
 

diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 083b00a8d3131744c569d0978dbb7e54e2ddd4a0..04f02c444320a8c81d5791e21e24b76e494aea11 100644 (file)
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,51 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d618b4ae5a3d2c78e70d0612d3511b39 ChangeLog 12620
-MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752
-MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693
-MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341
-MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817
-MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188
-MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323
-MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520
-MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500
-MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410
-MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415
-MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047
-MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438
-MD5 4a1f7ca15a6ef5aa00648eb8ad43a9e1 files/3.6_pre20041219/net.ippp0 2428
-MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685
-MD5 857c709217075d76229be25e413710d9 files/auerswald.usermap 397
-MD5 01e75c203125d9976400683136a21687 files/config-3.7_pre20050329 2872
-MD5 1485ac448762742431e425a8a9633caf files/config-3.7_pre20050626 2776
-MD5 6ac41911cd731019286016727a61f5ac files/config-3.7_pre20050821 2781
-MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219-r1 81
-MD5 0ec995fc0e6532f3934b3accad79f8cf files/digest-isdn4k-utils-3.7_pre20050626 81
-MD5 58808a3af01ef0246beb7d1b038c3faa files/digest-isdn4k-utils-3.7_pre20050821 81
-MD5 86576c4c0ae856485125ae3ae08c973d files/hisax.conf 1144
-MD5 f04fcf14f44566a2ca0719204ed87e4a files/hisax.initd 6556
-MD5 649d35c1add6b0d84e4280a432074351 files/hisax.usermap 122
+MD5 feee5c40e3619fe18a532086f1c13929 isdn4k-utils-3.7_pre20050626.ebuild 9401
+MD5 2b2caeb3cde723ef0fdf8a758e741757 isdn4k-utils-3.8_pre20050821.ebuild 10832
+MD5 c8fb346f5a0afc4b0f97474f69a07f23 ChangeLog 13046
+MD5 41bb308eb7db7d75c04a60f8cfb73be3 metadata.xml 418
+MD5 5eeb7174364e6bddb64a87d746660f78 isdn4k-utils-3.6_pre20041219-r1.ebuild 7145
+MD5 64c78da4643b660b18da623dcf0d9826 files/isdnlog.confd 679
+MD5 8f84f8daae8d5655d6da26d18dce0626 files/isdnlog.initd 2418
+MD5 6ac41911cd731019286016727a61f5ac files/config-3.8_pre20050821 2781
 MD5 92412760dfacc81cfac908d522ac8e39 files/ioptions 86
+MD5 58808a3af01ef0246beb7d1b038c3faa files/digest-isdn4k-utils-3.8_pre20050821 81
 MD5 9898159595a17b492bb241b959f5f074 files/ipppd-pcap-0.9.3.patch 1590
+MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219-r1 81
+MD5 e56d47fcff15cbd8278b196cdffd7433 files/isdnlog.logrotated 191
+MD5 f04fcf14f44566a2ca0719204ed87e4a files/hisax.initd 6556
 MD5 f7290656d6dcbd0ec40f00e3d797f79d files/isdn.blacklist 356
+MD5 48266d44ebe70519d3fc67a6b0e260ff files/options.ippp0 443
+MD5 649d35c1add6b0d84e4280a432074351 files/hisax.usermap 122
+MD5 01f12d0a19d1304719792797f8977782 files/isdn.pcmcia.conf 4581
+MD5 521e30e785f269e397b134eaaedb9072 files/net.ippp0 2412
 MD5 6e0925cc6a39e1aa656b143bf4fc75f6 files/isdn.confd 634
 MD5 cd9fbe733c2252c425ca6961aea2b6fc files/isdn.initd 3820
+MD5 86576c4c0ae856485125ae3ae08c973d files/hisax.conf 1144
 MD5 fc829217e8c183d2ab6e9b6dd5dd50e6 files/isdn.pcmcia 523
-MD5 01f12d0a19d1304719792797f8977782 files/isdn.pcmcia.conf 4581
-MD5 64c78da4643b660b18da623dcf0d9826 files/isdnlog.confd 679
-MD5 8f84f8daae8d5655d6da26d18dce0626 files/isdnlog.initd 2418
-MD5 e56d47fcff15cbd8278b196cdffd7433 files/isdnlog.logrotated 191
-MD5 521e30e785f269e397b134eaaedb9072 files/net.ippp0 2412
-MD5 48266d44ebe70519d3fc67a6b0e260ff files/options.ippp0 443
-MD5 5eeb7174364e6bddb64a87d746660f78 isdn4k-utils-3.6_pre20041219-r1.ebuild 7145
-MD5 feee5c40e3619fe18a532086f1c13929 isdn4k-utils-3.7_pre20050626.ebuild 9401
-MD5 b6cc49545644b428e300ec23ab2a401f isdn4k-utils-3.7_pre20050821.ebuild 10470
-MD5 41bb308eb7db7d75c04a60f8cfb73be3 metadata.xml 418
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGhyOI1lqEGTUzyQRAvhdAKDZVQrpwx/J6qPFUyzBrBCRGG3WsgCdGBnh
-thEHyck9OyE1qXPPSuzDl1I=
-=DEi8
------END PGP SIGNATURE-----
+MD5 01e75c203125d9976400683136a21687 files/config-3.7_pre20050329 2872
+MD5 1485ac448762742431e425a8a9633caf files/config-3.7_pre20050626 2776
+MD5 857c709217075d76229be25e413710d9 files/auerswald.usermap 397
+MD5 0ec995fc0e6532f3934b3accad79f8cf files/digest-isdn4k-utils-3.7_pre20050626 81
+MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415
+MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047
+MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323
+MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438
+MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817
+MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520
+MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685
+MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693
+MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188
+MD5 4a1f7ca15a6ef5aa00648eb8ad43a9e1 files/3.6_pre20041219/net.ippp0 2428
+MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500
+MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410
+MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341
+MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752

diff --git a/net-dialup/isdn4k-utils/files/config-3.7_pre20050821 b/net-dialup/isdn4k-utils/files/config-3.8_pre20050821
similarity index 100%
rename from net-dialup/isdn4k-utils/files/config-3.7_pre20050821
rename to net-dialup/isdn4k-utils/files/config-3.8_pre20050821

diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.7_pre20050821 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.8_pre20050821
similarity index 100%
rename from net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.7_pre20050821
rename to net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.8_pre20050821

diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050821.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
similarity index 94%
rename from net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050821.ebuild
rename to net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
index c5c2423ad1fffac219ba75c36b99024db1bf5e3d..740f944ec6a422acb93fa60f6eff1e3b19eb4cee 100644 (file)
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050821.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.7_pre20050821.ebuild,v 1.2 2005/09/03 21:58:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.8_pre20050821.ebuild,v 1.1 2005/09/05 22:07:17 sbriesen Exp $
 
 inherit eutils multilib gnuconfig linux-info
 
@@ -16,8 +16,8 @@ HOMEPAGE="http://www.isdn4linux.de/"
 
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
-IUSE="X unicode activefilter ipppd isdnlog eurofile usb pcmcia"
-#IUSE="X unicode activefilter ipppd isdnlog eurofile mysql postgres oracle"
+IUSE="X unicode activefilter mschap ipppd isdnlog eurofile usb pcmcia"
+# TODO: mysql postgres oracle radius
 SLOT="0"
 
 # mysql? ( dev-db/mysql )
@@ -31,6 +31,7 @@ DEPEND="virtual/linux-sources
        dev-lang/tcl
        X? ( virtual/x11 )
        eurofile? ( net-ftp/ftpbase )
+       ipppd? ( mschap? ( dev-libs/openssl ) )
        ipppd? ( activefilter? ( >=virtual/libpcap-0.9.3 ) )"
 
 RDEPEND="${DEPEND}
@@ -48,7 +49,7 @@ pkg_setup() {
                use activefilter && CONFIG_CHECK="${CONFIG_CHECK} IPPP_FILTER"
        fi
        use eurofile && CONFIG_CHECK="${CONFIG_CHECK} X25 ISDN_X25"
-       linux-info_pkg_setup
+       # linux-info_pkg_setup  -> disabled until I have a better solution
 
        # Get country code from I4L_CC variable
        # default country: DE (Germany)
@@ -117,6 +118,8 @@ src_unpack() {
        if use ipppd; then
                use activefilter || \
                sed -i -e "s:^\(CONFIG_IPPP_FILTER=.*\)$:# \1:g" .config
+               use mschap || \
+               sed -i -e "s:^\(CONFIG_IPPPD_MSCHAP=.*\)$:# \1:g" .config
        else
                sed -i -e "s:^\(CONFIG_IPPPD=.*\)$:# \1:g" \
                        -e "s:^\(CONFIG_IPPPSTATS=.*\)$:# \1:g" .config
@@ -149,6 +152,9 @@ src_unpack() {
        # Fixing /usr/lib to /usr/$(get_libdir} (for multilib-strict)
        sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" isdnctrl/Makefile.in
 
+       # Fixing location of openssl-headers
+       sed -i -e "s:<ssl/:<openssl/:g" ipppd/chap_ms.c
+
        # disable creation of /dev nodes
        sed -i -e "s:\(sh scripts/makedev.sh\):echo \1:g" Makefile
        sed -i -e "s:^\([[:space:]]*\)\(.*mknod.*capi20.*\)\$:\1# \2:g" \
@@ -167,15 +173,19 @@ src_unpack() {
                        iconv -f cp850 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
                done
        fi
-}
 
-src_compile() {
+       # run autoconf
        gnuconfig_update
-       for i in eicon; do
+       einfo "Running autoconf"
+       for i in icn imon loop divertctrl eicon hisax ipppd pcbit \
+               isdnctrl iprofd act2000 eurofile ipppstats isdnlog; do
                cd $i && autoconf || \
                        die "autoconf failed in dir $i"
                cd ..
        done
+}
+
+src_compile() {
        emake -j1 MYCFLAGS="${CFLAGS}" subconfig || die "make subconfig failed"
        emake -j1 MYCFLAGS="${CFLAGS}" || die "make failed"
 }