Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 140043 Details for
Bug 159013
asterisk-1.4.0 (and related) ebuilds
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
diff between zaptel 1.4.6 and 1.4.7.1 ebuilds
zaptel-ebuild-1.4.6-1.4.7.1.diff (text/plain), 7.82 KB, created by
Natanael Copa
on 2008-01-04 12:56:09 UTC
(
hide
)
Description:
diff between zaptel 1.4.6 and 1.4.7.1 ebuilds
Filename:
MIME Type:
Creator:
Natanael Copa
Created:
2008-01-04 12:56:09 UTC
Size:
7.82 KB
patch
obsolete
>--- zaptel-1.4.6.ebuild 2008-01-04 12:45:52 +0000 >+++ zaptel-1.4.7.1.ebuild 2008-01-04 12:37:47 +0000 >@@ -2,26 +2,26 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: $ > >-inherit toolchain-funcs eutils linux-mod >+inherit toolchain-funcs eutils linux-info linux-mod > > ## NOTE: > # > # bri and florz disabled > # > >-#BRI_VERSION="0.3.0-PRE-1v" >-#FLORZ_VERSION="0.3.0-PRE-1o_florz-12" >+BRI_VERSION="0.4.0-test4" >+FLORZ_VERSION="0.4.0-test1_florz-13" >+#http://zaphfc.florz.dyndns.org/zaphfc_0.4.0-test1_florz-13.diff.gz > >-#IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog zapras zapnet" >-IUSE="ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 rtc ukcid usb watchdog wanpipe zapras zapnet" >+IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid usb watchdog wanpipe zapras zapnet" > > MY_P="${P/_/-}" > > DESCRIPTION="Drivers for Digium and ZapataTelephony cards" > HOMEPAGE="http://www.asterisk.org" >-SRC_URI="http://ftp.digium.com/pub/zaptel/releases/${MY_P}.tar.gz" >-# bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz ) >-# florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz )" >+SRC_URI="http://ftp.digium.com/pub/zaptel/releases/${MY_P}.tar.gz >+ bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz ) >+ florz? ( http://www.netdomination.org/pub/asterisk/zaphfc_${FLORZ_VERSION}.diff.gz http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz)" > > S="${WORKDIR}/${MY_P}" > >@@ -29,7 +29,7 @@ > > SLOT="0" > LICENSE="GPL-2" >-KEYWORDS="~amd64 amd64" >+KEYWORDS="~x86 ~amd64" > > > RDEPEND="virtual/libc >@@ -169,8 +169,8 @@ > unpack ${A} > > cd "${S}" >- epatch "${FILESDIR}"/${P}-gentoo.diff >- kernel_is ge 2 6 22 && epatch "${FILESDIR}"/${P}-kern2.6.22.diff >+ epatch "${FILESDIR}"/${PN}-1.4.7.1-gentoo.diff >+# kernel_is ge 2 6 22 && epatch "${FILESDIR}"/${PN}-1.4.6-kern2.6.22.diff > > use ukcid && \ > epatch ${FILESDIR}/${PN}-1.2.0-ukcid.patch >@@ -179,44 +179,46 @@ > epatch ${FILESDIR}/${PN}-wanpipe_hdlc.patch > > # try to apply bristuff patch >-# if use bri; then >-# # fix for userpriv >-# chmod -R a=rwX "${S_BRI}" >-# >-# einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})" >-# epatch "${S_BRI}"/patches/zaptel.patch >-# >-# cd "${S_BRI}" >-# >-# if use florz; then >-# einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc" >-# >-# # remove as soon as there's a new florz patch available >-# sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \ >-# "${WORKDIR}"/zaphfc_${FLORZ_VERSION}.diff >-# >-# epatch "${WORKDIR}"/zaphfc_${FLORZ_VERSION}.diff >-# fi >-# >-# # patch includes >-# sed -i -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \ >-# qozap/qozap.c \ >-# zaphfc/zaphfc.c \ >-# cwain/cwain.c >-# >-# # patch makefiles >-# sed -i -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \ >-# -e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \ >-# -e "s:linux-2.6:linux:g" \ >-# qozap/Makefile \ >-# zaphfc/Makefile \ >-# cwain/Makefile >-# >-# sed -i -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \ >-# zaphfc/Makefile >-# >-# cd "${S}" >-# fi >+ if use bri; then >+ # fix for userpriv >+ chmod -R a=rwX "${S_BRI}" >+ >+ einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})" >+ epatch "${S_BRI}"/patches/zaptel.patch >+ >+ cd "${S_BRI}" >+ >+ if use florz; then >+ einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc" >+ >+ # remove as soon as there's a new florz patch available >+ sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \ >+ "${WORKDIR}"/zaphfc_${FLORZ_VERSION}.diff >+ >+ epatch "${WORKDIR}"/zaphfc_${FLORZ_VERSION}.diff >+ fi >+ >+ # patch includes >+ sed -i -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \ >+ qozap/qozap.c \ >+ zaphfc/zaphfc.c \ >+ cwain/cwain.c >+ >+ # patch makefiles >+ sed -i -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \ >+ -e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \ >+ -e "s:linux-2.6:linux:g" \ >+ qozap/Makefile \ >+ zaphfc/Makefile \ >+ cwain/Makefile >+ >+ sed -i -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \ >+ zaphfc/Makefile >+ >+ # bristuff sources needs to use KSRC >+ epatch "${FILESDIR}"/bristuff-0.4.0-test4-ksrc.patch >+ cd "${S}" >+ fi > > ### Configuration changes > local myEC >@@ -266,22 +268,23 @@ > cd "${S}"/xpp/utils > make || die "make xpp utils failed" > >-# if use bri; then >-# cd "${S_BRI}" >-# for x in cwain qozap zaphfc; do >-# einfo "Building ${x}..." >-# make KVERS=${KV_FULL} \ >-# KSRC=/usr/src/linux \ >-# ARCH=$(tc-arch-kernel) \ >-# -C ${x} || die "make ${x} failed" >-# done >-# fi >+ if use bri; then >+ cd "${S_BRI}" >+ for x in cwain qozap zaphfc; do >+ einfo "Building ${x}..." >+ make KVERS=${KV_FULL} \ >+ KSRC=${KV_DIR} \ >+ KINCLUDES=${KV_OUT_DIR}/include \ >+ ARCH=$(tc-arch-kernel) \ >+ -C ${x} || die "make ${x} failed" >+ done >+ fi > } > > src_install() { > kernel_is 2 4 && cp /etc/modules.conf "${D}"/etc > make DESTDIR="${D}" ARCH=$(tc-arch-kernel) \ >- KVERS=${KV_FULL} KSRC=/usr/src/linux install || die >+ KVERS=${KV_FULL} KSRC=${KV_DIR} install || die > > dodoc ChangeLog README README.Linux26 README.fxsusb zaptel.init > dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune >@@ -294,40 +297,40 @@ > insinto /usr/include/zaptel > doins *.h > >-# if use bri; then >-# einfo "Installing bri" >-# cd "${S_BRI}" >-# >-# insinto /lib/modules/${KV_FULL}/misc >-# doins qozap/qozap.${KV_OBJ} >-# doins zaphfc/zaphfc.${KV_OBJ} >-# doins cwain/cwain.${KV_OBJ} >-# >-# # install example configs for octoBRI and quadBRI >-# insinto /etc >-# doins qozap/zaptel.conf.octoBRI >-# newins qozap/zaptel.conf zaptel.conf.quadBRI >-# newins zaphfc/zaptel.conf zaptel.conf.zaphfc >-# >-# insinto /etc/asterisk >-# doins qozap/zapata.conf.octoBRI >-# newins qozap/zapata.conf zapata.conf.quadBRI >-# newins zaphfc/zapata.conf zapata.conf.zaphfc >-# >-# docinto bristuff >-# dodoc CHANGES INSTALL >-# >-# docinto bristuff/qozap >-# dodoc qozap/LICENSE qozap/TODO qozap/*.conf* >-# >-# docinto bristuff/zaphfc >-# dodoc zaphfc/LICENSE zaphfc/*.conf >-# >-# docinto bristuff/cwain >-# dodoc cwain/TODO cwain/LICENSE >-# >-# cd "${S}" >-# fi >+ if use bri; then >+ einfo "Installing bri" >+ cd "${S_BRI}" >+ >+ insinto /lib/modules/${KV_FULL}/misc >+ doins qozap/qozap.${KV_OBJ} >+ doins zaphfc/zaphfc.${KV_OBJ} >+ doins cwain/cwain.${KV_OBJ} >+ >+ # install example configs for octoBRI and quadBRI >+ insinto /etc >+ doins qozap/zaptel.conf.octoBRI >+ newins qozap/zaptel.conf zaptel.conf.quadBRI >+ newins zaphfc/zaptel.conf zaptel.conf.zaphfc >+ >+ insinto /etc/asterisk >+ doins qozap/zapata.conf.octoBRI >+ newins qozap/zapata.conf zapata.conf.quadBRI >+ newins zaphfc/zapata.conf zapata.conf.zaphfc >+ >+ docinto bristuff >+ dodoc CHANGES INSTALL >+ >+ docinto bristuff/qozap >+ dodoc qozap/LICENSE qozap/TODO qozap/*.conf* >+ >+ docinto bristuff/zaphfc >+ dodoc zaphfc/LICENSE zaphfc/*.conf >+ >+ docinto bristuff/cwain >+ dodoc cwain/TODO cwain/LICENSE >+ >+ cd "${S}" >+ fi > > # install init script > newinitd "${FILESDIR}"/zaptel.rc6 zaptel >@@ -359,20 +362,20 @@ > einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!" > echo > >-# if use bri; then >-# einfo "Bristuff configs have been merged as:" >-# einfo "" >-# einfo "${ROOT}etc/" >-# einfo " zaptel.conf.zaphfc" >-# einfo " zaptel.conf.quadBRI" >-# einfo " zaptel.conf.octoBRI" >-# einfo "" >-# einfo "${ROOT}etc/asterisk/" >-# einfo " zapata.conf.zaphfc" >-# einfo " zapata.conf.quadBRI" >-# einfo " zapata.conf.octoBRI" >-# echo >-# fi >+ if use bri; then >+ einfo "Bristuff configs have been merged as:" >+ einfo "" >+ einfo "${ROOT}etc/" >+ einfo " zaptel.conf.zaphfc" >+ einfo " zaptel.conf.quadBRI" >+ einfo " zaptel.conf.octoBRI" >+ einfo "" >+ einfo "${ROOT}etc/asterisk/" >+ einfo " zapata.conf.zaphfc" >+ einfo " zapata.conf.quadBRI" >+ einfo " zapata.conf.octoBRI" >+ echo >+ fi > > # fix permissions if there's no udev / devfs around > if [[ -d "${ROOT}"dev/zap ]]; then
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 159013
:
105003
|
105004
|
105448
|
120258
|
120271
|
120272
|
124810
|
124811
|
124812
|
128192
|
131363
|
136200
|
136202
|
136204
|
136205
|
136207
|
136209
|
140019
|
140021
|
140038
|
140041
|
140042
|
140043
|
143656
|
143658
|
143660
|
143940
|
143941
|
143942
|
144324
|
144326
|
147840
|
147843
|
147845
|
147851
|
161232
|
161233