From e5b33393c85155640cded1179190466d0e10e348 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Sat, 27 Nov 2004 13:25:29 +0000 Subject: add support for ppp-2.4.3; imported from #72406 --- net-dialup/capi4k-utils/ChangeLog | 9 +- net-dialup/capi4k-utils/Manifest | 17 +--- .../capi4k-utils/capi4k-utils-20041006-r2.ebuild | 7 +- .../capi4k-utils/capi4k-utils-20041006-r3.ebuild | 106 +++++++++++++++++++++ .../capi4k-utils/files/20041006/capi4k-utils.patch | 24 ----- .../files/digest-capi4k-utils-20041006-r2 | 1 + .../files/digest-capi4k-utils-20041006-r3 | 2 + 7 files changed, 125 insertions(+), 41 deletions(-) create mode 100644 net-dialup/capi4k-utils/capi4k-utils-20041006-r3.ebuild delete mode 100644 net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch create mode 100644 net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r3 (limited to 'net-dialup/capi4k-utils') diff --git a/net-dialup/capi4k-utils/ChangeLog b/net-dialup/capi4k-utils/ChangeLog index 5810a74ad380..234b64e7e3ce 100644 --- a/net-dialup/capi4k-utils/ChangeLog +++ b/net-dialup/capi4k-utils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/capi4k-utils # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.22 2004/11/14 20:16:15 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/ChangeLog,v 1.23 2004/11/27 13:25:29 mrness Exp $ + +*capi4k-utils-20041006-r3 (27 Nov 2004) + + 27 Nov 2004; Alin Nastac + -files/20041006/capi4k-utils.patch, capi4k-utils-20041006-r2.ebuild, + +capi4k-utils-20041006-r3.ebuild: + Add support for ppp-2.4.3, thanks to tove . See bug #72406. 14 Nov 2004; Alin Nastac capi4k-utils-20041006-r2.ebuild: diff --git a/net-dialup/capi4k-utils/Manifest b/net-dialup/capi4k-utils/Manifest index bedefc0569ee..060af09399c1 100644 --- a/net-dialup/capi4k-utils/Manifest +++ b/net-dialup/capi4k-utils/Manifest @@ -1,27 +1,18 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 8a68cd59daa9bd143ce9987778320b62 capi4k-utils-20040810.ebuild 1760 MD5 22354caf6445da21e5ebe8609a9e7012 capi4k-utils-20041006.ebuild 2267 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 MD5 d5791aa84125104e8d985dc2c663da1f ChangeLog 3513 -MD5 6e4b2e737e51d83da2152f1419ba15f7 capi4k-utils-20041006-r2.ebuild 3145 +MD5 d3e96b864d3dc4bef3152ddbe4bf7a59 capi4k-utils-20041006-r2.ebuild 3181 +MD5 a576c676fd06b0c00bb8e10d33d6c04a capi4k-utils-20041006-r3.ebuild 3238 MD5 befd926d2f898c15846c2f7452853ec1 files/capi-init-20040810 609 MD5 b1de4263d145b4fb13baf0e4791e49a0 files/capi-init-20041006 617 MD5 9bc030e6ab061e50f16efb0def04f0b6 files/capi4k-utils-2004-10-06-fPIC.patch 286 MD5 8b4a7394c2826badb822b9575dbfbd4d files/capi4k-utils-2004-10-06.patch 2144 MD5 daf5a35ac5aeac77c4ac69274ed15395 files/digest-capi4k-utils-20040810 75 MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006 75 -MD5 f2524d2cc37ffcbc2096a4f0ac7177c7 files/digest-capi4k-utils-20041006-r2 75 +MD5 5567e0f076f3d1faafcd0d4fa39a1c4e files/digest-capi4k-utils-20041006-r2 156 +MD5 5567e0f076f3d1faafcd0d4fa39a1c4e files/digest-capi4k-utils-20041006-r3 156 MD5 2c94e9d125d5c9af8c485d8b844f55a2 files/20041006/README.gentoo 1548 MD5 f9d08e560e844f4556da1f58bb5513b4 files/20041006/capi.init 829 -MD5 2892db0b497c4141318dbf30ef60e550 files/20041006/capi4k-utils.patch 1075 MD5 edc50538053b658093927f9fb28c3aff files/20041006/config 195 MD5 2fe94d2623c5b129780b72bacaf4a7bc files/20041006/rcapid.xinetd 236 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBmP6mjtv59x0+BrURAg+PAKDJuRPbnjmbHooF2tZeIC7vMfkPxACgoDWZ -quzKK+RxpR11dCoy8BW1hOc= -=vK7z ------END PGP SIGNATURE----- diff --git a/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild index e96fd6d34229..75932dd3e5e7 100644 --- a/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild +++ b/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild,v 1.7 2004/11/15 19:08:09 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r2.ebuild,v 1.8 2004/11/27 13:25:29 mrness Exp $ inherit eutils @@ -20,7 +20,8 @@ KEYWORDS="x86 ~amd64 ~ppc" IUSE="" S=${WORKDIR}/${PN} SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz - ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz" + ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz + mirror://gentoo/${P}-patches.tar.bz2" DEPEND="virtual/linux-sources dev-lang/perl @@ -37,7 +38,7 @@ src_unpack() { # set our config cp -f ${MY_FILES}/config .config # fix the little odd bugs - epatch ${MY_FILES}/${PN}.patch || die "patch failed" + epatch ${WORKDIR}/${PN}.diff || die "patch failed" # patch includes of all *.c files sed -i -e "s:linux/capi.h>$:linux/compiler.h>\n#include :g" */*.c || die "sed failed" # patch all Makefile.am and Rules.make to use our CFLAGS diff --git a/net-dialup/capi4k-utils/capi4k-utils-20041006-r3.ebuild b/net-dialup/capi4k-utils/capi4k-utils-20041006-r3.ebuild new file mode 100644 index 000000000000..e92883bfa078 --- /dev/null +++ b/net-dialup/capi4k-utils/capi4k-utils-20041006-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/capi4k-utils-20041006-r3.ebuild,v 1.1 2004/11/27 13:25:29 mrness Exp $ + +inherit eutils + +YEAR_PV=${PV:0:4} +MON_PV=${PV:4:2} +DAY_PV=${PV:6:2} + +MY_FILES=${FILESDIR}/${PV} +MY_P=${PN}-${YEAR_PV}-${MON_PV}-${DAY_PV} +PPPVERSIONS="2.4.2 2.4.3" # versions in portage + +DESCRIPTION="CAPI4Linux Utils" +HOMEPAGE="ftp://ftp.in-berlin.de/pub/capi4linux/" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 ~amd64 ~ppc" +IUSE="" +S=${WORKDIR}/${PN} +SRC_URI="ftp://ftp.in-berlin.de/pub/capi4linux/${MY_P}.tar.gz + ftp://ftp.in-berlin.de/pub/capi4linux/OLD/${MY_P}.tar.gz + mirror://gentoo/${P}-patches.tar.bz2" + +DEPEND="virtual/linux-sources + dev-lang/perl + >=sys-apps/sed-4 + virtual/os-headers + sys-devel/automake + sys-devel/autoconf + sys-devel/libtool" +RDEPEND="" + +src_unpack() { + unpack ${A} || die "failed to unpack sources" + cd ${S} + # set our config + cp -f ${MY_FILES}/config .config + # fix the little odd bugs + EPATCH_OPTS="-p1" + epatch ${WORKDIR}/${PN}.diff ${WORKDIR}/ppp-2.4.3.diff || die "${PN} patch failed" + # patch includes of all *.c files + sed -i -e "s:linux/capi.h>$:linux/compiler.h>\n#include :g" */*.c || die "sed failed" + # patch all Makefile.am and Rules.make to use our CFLAGS + sed -i -e "s:^CFLAGS\(.*\)-O2:CFLAGS\1${CFLAGS}:g" */Makefile.am */Rules.make || die "sed failed" + # patch capi20/Makefile.am to use -fPIC for shared library + sed -i -e "s:^\(libcapi20_la_CFLAGS = \):\1-fPIC :g" capi20/Makefile.am || die "sed failed" + # patch pppdcapiplugin/Makefile to use only the ppp versions we want + sed -i -e "s:^\(PPPVERSIONS = \).*$:\1${PPPVERSIONS}:g" pppdcapiplugin/Makefile || die "sed failed" +} + +src_compile() { + # required by fPIC patch + cd ${S}/capi20 || die "capi20 directory not found" + ebegin "Updating autotools-generated files" + aclocal -I . || die "aclocal failed" + automake -a || die "automake failed" + autoconf || die "autoconf failed" + libtoolize -f -c || die "libtoolize failed" + eend $? + cd ${S} + + emake subconfig || die "make subconfig failed" + emake || die "make failed" +} + +src_install() { + dodir /dev + emake DESTDIR=${D} install || die "make install failed" + + # install docs + newdoc rcapid/README README.rcapid + newdoc pppdcapiplugin/README README.pppdcapiplugin + dodoc scripts/makedev.sh ${MY_FILES}/README.gentoo + docinto pppdcapiplugin.examples; dodoc pppdcapiplugin/examples/* + + # install init-script + newinitd ${FILESDIR}/${PV}/capi.init capi + + # example config + insinto /etc + insopts -m 0600 + doins capiinit/capi.conf + + # rcapid config for xinetd + insinto /etc/xinetd.d + insopts -m 0644 + newins ${FILESDIR}/${PV}/rcapid.xinetd rcapid + + # very useful tool ;-) + dobin scripts/isdncause +} + +pkg_postinst() { + einfo "Please read the instructions in:" + einfo "/usr/share/doc/${PF}/README.gentoo.gz" + einfo "" + einfo "Annotation for active AVM ISDN boards (B1 ISA/PCI, ...):" + einfo "If you run" + einfo " emerge capi4k-firmware" + einfo "you will probably find your board's firmware in /usr/share/isdn." + einfo "" + einfo "If you have another active ISDN board, you should create" + einfo "/usr/share/isdn and copy there your board's firmware." +} diff --git a/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch b/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch deleted file mode 100644 index 646557d336b1..000000000000 --- a/net-dialup/capi4k-utils/files/20041006/capi4k-utils.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur capi4k-utils_old/capi20/capiutils.h capi4k-utils/capi20/capiutils.h ---- capi4k-utils_old/capi20/capiutils.h 2004-10-06 17:13:33.000000000 +0200 -+++ capi4k-utils/capi20/capiutils.h 2004-10-14 11:18:07.049529668 +0200 -@@ -918,7 +918,7 @@ - ,_cstruct BChannelinformation - ,_cstruct Keypadfacility - ,_cstruct Useruserdata -- ,_cstruct Facilitydataarra); -+ ,_cstruct Facilitydataarray); - unsigned CONNECT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber - ,_cdword adr - ,_cword CIPValue -diff -Naur capi4k-utils_old/capifax/capi.c capi4k-utils/capifax/capi.c ---- capi4k-utils_old/capifax/capi.c 2004-08-10 14:11:20.000000000 +0200 -+++ capi4k-utils/capifax/capi.c 2004-10-14 11:16:52.699740737 +0200 -@@ -82,7 +82,7 @@ - * of the application - */ - ALERT_REQ (CMSG, Appl_Id, 0, CONNECT_IND_PLCI(CMSG), -- NULL, NULL, NULL, NULL, NULL); -+ NULL, NULL, NULL, NULL); - /* inform the user application */ - SetState(Connection, D_ConnectPending); - IncomingCall(Connection, GetCallingPartyNumber (Connection)); diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 index 63aefc8b31c8..34abafb72602 100644 --- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 +++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 @@ -1 +1,2 @@ MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667 +MD5 74951d290e717c8bc87887f55ad3e0dd capi4k-utils-20041006-patches.tar.bz2 11674 diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r3 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r3 new file mode 100644 index 000000000000..34abafb72602 --- /dev/null +++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r3 @@ -0,0 +1,2 @@ +MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667 +MD5 74951d290e717c8bc87887f55ad3e0dd capi4k-utils-20041006-patches.tar.bz2 11674 -- cgit v1.2.3-65-gdbad