summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavoz@gentoo.org>2006-11-07 20:09:34 +0000
committerGustavo Zacarias <gustavoz@gentoo.org>2006-11-07 20:09:34 +0000
commitdb9b97639ba2b1be1503a078b04448d32dbb6b76 (patch)
tree714938de06eea77a607d26b5b71177bd742679e7 /net-misc/zaptel
parentfix pkgconfig fix (diff)
downloadhistorical-db9b97639ba2b1be1503a078b04448d32dbb6b76.tar.gz
historical-db9b97639ba2b1be1503a078b04448d32dbb6b76.tar.bz2
historical-db9b97639ba2b1be1503a078b04448d32dbb6b76.zip
Revbump with fixes for #148374 and #154241
Package-Manager: portage-2.1.1-r1
Diffstat (limited to 'net-misc/zaptel')
-rw-r--r--net-misc/zaptel/ChangeLog8
-rw-r--r--net-misc/zaptel/Manifest35
-rw-r--r--net-misc/zaptel/files/digest-zaptel-1.2.109
-rw-r--r--net-misc/zaptel/files/digest-zaptel-1.2.9.11
-rw-r--r--net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff104
-rw-r--r--net-misc/zaptel/zaptel-1.2.10.ebuild352
6 files changed, 497 insertions, 12 deletions
diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index d5fd4945d685..10fd3a3557a6 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/zaptel
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.82 2006/10/06 22:54:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.83 2006/11/07 20:09:34 gustavoz Exp $
+
+*zaptel-1.2.10 (07 Nov 2006)
+
+ 07 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+ +files/zaptel-1.2.10-gentoo.diff, +zaptel-1.2.10.ebuild:
+ Revbump with fixes for #148374 and #154241
06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> zaptel-1.2.9.1.ebuild:
Stable on x86 wrt bug #144941.
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index ce7f009e7482..bd0efa082fc7 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -33,6 +33,10 @@ AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d
MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.2.0-ukcid.patch 3787
SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.2.0-ukcid.patch 3787
+AUX zaptel-1.2.10-gentoo.diff 5178 RMD160 29595663ff4cde4852926525b0ccb29ef5b1aed7 SHA1 52f7af64f01dabd5bad0d080a30d04a5405e769c SHA256 d8edce4d8796c7d9d18b85ab1b4758e9c9cd65182b3cad13d1021cedf0cf04a9
+MD5 74e9e15a5dc001835bcfdfd86d1baab0 files/zaptel-1.2.10-gentoo.diff 5178
+RMD160 29595663ff4cde4852926525b0ccb29ef5b1aed7 files/zaptel-1.2.10-gentoo.diff 5178
+SHA256 d8edce4d8796c7d9d18b85ab1b4758e9c9cd65182b3cad13d1021cedf0cf04a9 files/zaptel-1.2.10-gentoo.diff 5178
AUX zaptel-1.2.9.1-ar.patch 924 RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe SHA1 fdf329d360508d8e629d196d4f0e6ccfabf24dff SHA256 8a8374b2689ed70108d10eb704bb6d3b35550f33a183e039e7efd69c7a681485
MD5 235d2550fd9a0bde64929e27a6a2343d files/zaptel-1.2.9.1-ar.patch 924
RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe files/zaptel-1.2.9.1-ar.patch 924
@@ -67,21 +71,27 @@ RMD160 fc92cf8fcbf9ed49b7918557670417e15f84f281 files/zaptel.udevd 358
SHA256 9be02c6b22db788d8a8fabc5bc2574102b50c3b329cff12c342d39896c7615b5 files/zaptel.udevd 358
DIST bristuff-0.2.0-RC8q.tar.gz 152037 RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 SHA1 27a6f56f47aa7ee5459d2625da7cff310909764e SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728
DIST bristuff-0.3.0-PRE-1s.tar.gz 265953 RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 SHA1 1d942df9e4fd963755080e011caba88a33601c1b SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d
+DIST bristuff-0.3.0-PRE-1v.tar.gz 267644 RMD160 5c5f034d29f4156351a495f40c9c4b176f65e06e SHA1 0ffbe79cd44119b09eb744eb9bf1b6fb90fa1bab SHA256 91254dd6c71b74a5990df622b523d06c2f0399c6e47630e5155392c1598fd39e
DIST zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736 RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 SHA1 f8ab2f312c6a2b2f607b9e7f3ccbcca0858c53a7 SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c
DIST zaptel-1.0.10.tar.gz 327832 RMD160 a797bb36f35e50c51d30705ad1d628f5728d87ed SHA1 98544260fca2afbcd304f7354b62a56138e15a09 SHA256 7978f3c56a95033bf2bc2cb8d0cb2830c5371aae21e0021503c6dbf2361795d1
+DIST zaptel-1.2.10.tar.gz 1258750 RMD160 3e33a496127c78e52178a73255f6da55c2b9a5d2 SHA1 6b69c4822b9cc1dbc48868eb61bc88e3212b7545 SHA256 170a0c18efe2da3cd17946850c6249a9824f753d6705a27ffef47fb8e8a7f9d7
DIST zaptel-1.2.9.1.tar.gz 1255412 RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a SHA1 6145301bb47107c0910a098e26b4ca5cdb2377ab SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede
EBUILD zaptel-1.0.10-r1.ebuild 7197 RMD160 2f60f18488f4b49ac43e4310fe4501939f96b405 SHA1 e919d6ca40ee2efcc2afe1f898c4118207a1cf6b SHA256 e533d31fd85708fec97e0e315ee738ad964aadfeb84f8f9595059a6efca501a3
MD5 33564fe4757a198a8f2a627408c9a9b1 zaptel-1.0.10-r1.ebuild 7197
RMD160 2f60f18488f4b49ac43e4310fe4501939f96b405 zaptel-1.0.10-r1.ebuild 7197
SHA256 e533d31fd85708fec97e0e315ee738ad964aadfeb84f8f9595059a6efca501a3 zaptel-1.0.10-r1.ebuild 7197
+EBUILD zaptel-1.2.10.ebuild 8582 RMD160 a4547a159b07ac039081d686777ea8ec927542c3 SHA1 173f455dad45956460205355b64010aa9b70f50b SHA256 7f6265635c0f97b7cd6a2cda017b1691038308d4c56f2e114f97098234e2ca3a
+MD5 666bb17698ac00689d63042a4d0937da zaptel-1.2.10.ebuild 8582
+RMD160 a4547a159b07ac039081d686777ea8ec927542c3 zaptel-1.2.10.ebuild 8582
+SHA256 7f6265635c0f97b7cd6a2cda017b1691038308d4c56f2e114f97098234e2ca3a zaptel-1.2.10.ebuild 8582
EBUILD zaptel-1.2.9.1.ebuild 8574 RMD160 cd382f76b994968506eff1b47adb7f3f89711acb SHA1 624312f6d96de7031fcc49013469fac286472232 SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af
MD5 855074ab185dd77d5d0851657c61f313 zaptel-1.2.9.1.ebuild 8574
RMD160 cd382f76b994968506eff1b47adb7f3f89711acb zaptel-1.2.9.1.ebuild 8574
SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af zaptel-1.2.9.1.ebuild 8574
-MISC ChangeLog 16176 RMD160 e79dafea4092ac01b3e40f4201602de20081d501 SHA1 61a393c597de6aaf87efedaf17b77ce6763f72fc SHA256 505e04ca9f6db9330acaf4dd19b92da3ea69c244b3345980660f8a26d5ee25e7
-MD5 24a0308ac93318ef288e65792627aab7 ChangeLog 16176
-RMD160 e79dafea4092ac01b3e40f4201602de20081d501 ChangeLog 16176
-SHA256 505e04ca9f6db9330acaf4dd19b92da3ea69c244b3345980660f8a26d5ee25e7 ChangeLog 16176
+MISC ChangeLog 16365 RMD160 5047f0aa20506685ca1632125db5f01ab8949188 SHA1 85e7206cd3194468695478c16b842086c5c394af SHA256 f66c9cadc57412a0352b496c069de61f1fc9284398fd116b7eb86205b20c37a0
+MD5 278844b6c55a116d664aeb62310b89be ChangeLog 16365
+RMD160 5047f0aa20506685ca1632125db5f01ab8949188 ChangeLog 16365
+SHA256 f66c9cadc57412a0352b496c069de61f1fc9284398fd116b7eb86205b20c37a0 ChangeLog 16365
MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
@@ -89,13 +99,16 @@ SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20 metadata
MD5 35f5df1004da005d708c3c6c99269aed files/digest-zaptel-1.0.10-r1 500
RMD160 276619c3b2cd6e00ca47a0f6196de3fd375f78f1 files/digest-zaptel-1.0.10-r1 500
SHA256 97f4cbc2c2075338a5fbb1c0da7f79f365725d49e9d6cb89a974db23c6e5a83d files/digest-zaptel-1.0.10-r1 500
-MD5 e2e7717e2b2b91f4467e4033eb8607ab files/digest-zaptel-1.2.9.1 718
-RMD160 bbbf4cfe894f55f780600625ef67ddfe1df3857f files/digest-zaptel-1.2.9.1 718
-SHA256 7fd0cc0e5893f855fd9543b817ca20d2bcf6101634c7483a6b29eb2bbb8fabae files/digest-zaptel-1.2.9.1 718
+MD5 41c03c826202769a4ae6f92c8a5d5226 files/digest-zaptel-1.2.10 795
+RMD160 b51b15adcc314cd6f5a6bc11a9730e3a572cfa97 files/digest-zaptel-1.2.10 795
+SHA256 00cda49073896bdb9fb26651a85643ae15b02136adfe28feb846db17729c2e37 files/digest-zaptel-1.2.10 795
+MD5 1e13a9665022158b1d78f47b331688ed files/digest-zaptel-1.2.9.1 798
+RMD160 f10faf8fefa2221dfa0fd8e8a85b658a095d803c files/digest-zaptel-1.2.9.1 798
+SHA256 367d7228a51892a9ad986338a37a3355564b2fc324af014a65f7af78bf676b3d files/digest-zaptel-1.2.9.1 798
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-iD8DBQFFJt6kkT4lNIS36YERAumrAJ0bkRCqg3WUO5ZWryotOAdR0J6NgQCdGc6K
-HFi9M1TO+LQNCcOpMka2rPQ=
-=sjJL
+iD8DBQFFUOf2KRy60XGEcJIRApLfAKCkAIHeRMCPyeKfbhQh9yCpmGCyHgCgnqCf
+FT+lwUKy3ddAjp1rda3iWLw=
+=r40U
-----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.10 b/net-misc/zaptel/files/digest-zaptel-1.2.10
new file mode 100644
index 000000000000..2b2ac12e48d2
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.10
@@ -0,0 +1,9 @@
+MD5 9da38a78556eb09749d1f789a8a2631c bristuff-0.3.0-PRE-1v.tar.gz 267644
+RMD160 5c5f034d29f4156351a495f40c9c4b176f65e06e bristuff-0.3.0-PRE-1v.tar.gz 267644
+SHA256 91254dd6c71b74a5990df622b523d06c2f0399c6e47630e5155392c1598fd39e bristuff-0.3.0-PRE-1v.tar.gz 267644
+MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
+MD5 25f9a78272104efdbd44261e33edb725 zaptel-1.2.10.tar.gz 1258750
+RMD160 3e33a496127c78e52178a73255f6da55c2b9a5d2 zaptel-1.2.10.tar.gz 1258750
+SHA256 170a0c18efe2da3cd17946850c6249a9824f753d6705a27ffef47fb8e8a7f9d7 zaptel-1.2.10.tar.gz 1258750
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.9.1 b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
index 9f4750b3466b..0e5dc7eddaa4 100644
--- a/net-misc/zaptel/files/digest-zaptel-1.2.9.1
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
@@ -1,6 +1,7 @@
MD5 760eba19b03d03cd1dc8648d6239b4af bristuff-0.3.0-PRE-1s.tar.gz 265953
RMD160 8d3abdbbae4c376d52225395c72f4538e1f84a94 bristuff-0.3.0-PRE-1s.tar.gz 265953
SHA256 30adea4f070ed44d1952163e850c177f976857b96965e18844ccd492ccef968d bristuff-0.3.0-PRE-1s.tar.gz 265953
+MD5 541b0a5910843d3c0b6a9de9467b9401 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
RMD160 b95d2301402e1108bc480ce0e66e87e3062eccf8 zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
SHA256 04a8dd22d581b5d28d46a589d695f6eb634bf2bf355347a637fe2d560a63528c zaphfc_0.3.0-PRE-1o_florz-12.diff.gz 10736
MD5 c2f5798196ac1b53f4161547cc4efb2c zaptel-1.2.9.1.tar.gz 1255412
diff --git a/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff
new file mode 100644
index 000000000000..ab4b77e3b440
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.10-gentoo.diff
@@ -0,0 +1,104 @@
+diff -Nura zaptel-1.2.10/build_tools/genmodconf zaptel-1.2.10.gentoo/build_tools/genmodconf
+--- zaptel-1.2.10/build_tools/genmodconf 2006-05-23 14:51:00.000000000 -0300
++++ zaptel-1.2.10.gentoo/build_tools/genmodconf 2006-11-07 16:50:50.334340709 -0300
+@@ -79,20 +79,6 @@
+
+ echo Building ${target}...
+
+-if [ "${1}" == "linux24" ]; then
+- for mod in ${3}; do
+- if ! grep -q "post-install ${mod} " ${target}; then
+- echo "post-install ${mod} /sbin/ztcfg" >> ${target}
+- fi
+- done
+-elif [ "${1}" == "linux26" ]; then
+- for mod in ${3}; do
+- if ! grep -q "install ${mod} " ${target}; then
+- echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
+- fi
+- done
+-fi
+-
+ if ! grep -q "alias wcfxs" ${target}; then
+ echo "alias wcfxs wctdm" >> ${target};
+ fi;
+diff -Nura zaptel-1.2.10/build_tools/genudevrules zaptel-1.2.10.gentoo/build_tools/genudevrules
+--- zaptel-1.2.10/build_tools/genudevrules 2006-05-17 13:49:46.000000000 -0300
++++ zaptel-1.2.10.gentoo/build_tools/genudevrules 2006-11-07 16:50:50.335340457 -0300
+@@ -22,9 +22,9 @@
+
+ cat <<EOF
+ # zaptel devices with ownership/permissions for running as non-root
+-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
++KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
+ EOF
+diff -Nura zaptel-1.2.10/Makefile zaptel-1.2.10.gentoo/Makefile
+--- zaptel-1.2.10/Makefile 2006-10-11 14:22:10.000000000 -0300
++++ zaptel-1.2.10.gentoo/Makefile 2006-11-07 16:52:46.910007121 -0300
+@@ -23,7 +23,7 @@
+ endif
+ KINCLUDES:=$(KSRC)/include
+
+-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
++CFLAGS+=-I. -Iinclude -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
+@@ -300,7 +300,8 @@
+ done
+ else # DYNFS
+ ifdef UDEVRULES
+- build_tools/genudevrules > $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules
++ build_tools/genudevrules > zaptel.rules
++ install -D -m 644 zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d/10-zaptel.rules
+ else # !UDEVRULES
+ @echo "**** Dynamic filesystem detected -- not creating device nodes"
+ endif
+@@ -315,7 +316,7 @@
+ tar -zxf mISDNuser.tar.gz
+ $(MAKE) -C mISDNuser install
+
+-install: all devices firmware
++install: devices firmware
+ install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ if [ -f sethdlc-new ]; then \
+ install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
+@@ -338,24 +339,21 @@
+ fi; \
+ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
+ install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+- [ `id -u` = 0 ] && /sbin/ldconfig || :
++ [ `id -u` = 0 ] && /sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib || :
+ rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
+ ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
+- if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
+ install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+- install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
+- install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
+- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
++ install -d $(INSTALL_PREFIX)/usr/share/man/man8
++ install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8/
++ install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8/
+ [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+- build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+- @if [ -d /etc/modutils ]; then \
+- /sbin/update-modules ; \
+- fi
++ install -d -m 755 $(INSTALL_PREFIX)/etc/modules.d
++ build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+
+ install-udev: devices
+
diff --git a/net-misc/zaptel/zaptel-1.2.10.ebuild b/net-misc/zaptel/zaptel-1.2.10.ebuild
new file mode 100644
index 000000000000..baebdbbe56b7
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.2.10.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.10.ebuild,v 1.1 2006/11/07 20:09:34 gustavoz Exp $
+
+inherit toolchain-funcs eutils linux-mod
+
+## NOTE:
+#
+#
+
+BRI_VERSION="0.3.0-PRE-1v"
+FLORZ_VERSION="0.3.0-PRE-1o_florz-12"
+
+IUSE="bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2 florz rtc ukcid watchdog 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="virtual/libc
+ virtual/linux-sources
+ >=dev-libs/newt-0.50.0"
+
+# list of echo canceller use flags,
+# first active in this list is selected (=order does matter)
+ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
+
+### Begin: Helper functions
+
+select_echo_cancel() {
+ local myEC=""
+
+ for x in ${ZAP_EC_FLAGS}; do
+ if use $x; then
+ myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
+ break;
+ fi
+ done
+
+ echo ${myEC}
+}
+
+zconfig_disable() {
+ if grep -q "${1}" ${S}/zconfig.h; then
+ # match a little more than ${1} so we can use zconfig_disable
+ # to disable all echo cancellers in zconfig.h w/o calling it several times
+ sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
+ ${S}/zconfig.h
+ fi
+
+ return $?
+}
+
+zconfig_enable() {
+ if grep -q "${1}" ${S}/zconfig.h; then
+ sed -i -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
+ -e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
+ ${S}/zconfig.h
+ fi
+
+ return $?
+}
+
+### End: Helper functions
+
+pkg_setup() {
+ local result=0 numec=0
+
+ linux-mod_pkg_setup
+
+ einfo "Running pre-flight checks..."
+
+ # basic zaptel checks
+ if ! linux_chkconfig_present CRC_CCITT; then
+ echo
+ eerror "Your kernel lacks CRC_CCIT support!"
+ eerror "Enable CONFIG_CRC_CCIT!"
+ result=$((result+1))
+ fi
+
+ # check if multiple echo cancellers have been selected
+ for x in ${ZAP_EC_FLAGS}; do
+ use $x && numec=$((numec+1))
+ done
+ if [[ $numec -gt 1 ]]; then
+ # multiple flags are active, only the first in the ZAP_EC_FLAGS list
+ # will be used, make sure the user knows about this
+ echo
+ ewarn "Multiple echo canceller flags are active but only one will be used!"
+ ewarn "Selected: $(select_echo_cancel)"
+ fi
+
+ # we need at least HDLC generic support
+ if use zapnet && ! linux_chkconfig_present HDLC; then
+ echo
+ eerror "zapnet: Your kernel lacks HDLC support!"
+ eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
+ result=$((result+1))
+ fi
+
+ # zapras needs PPP support
+ if use zapras && ! linux_chkconfig_present PPP; then
+ echo
+ eerror "zapras: Your kernel lacks PPP support!"
+ eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
+ result=$((result+1))
+ fi
+
+ # rtc needs linux-2.6 and CONFIG_RTC
+ if use rtc; then
+ if ! kernel_is 2 6; then
+ echo
+ eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
+ result=$((result+1))
+ fi
+
+ if ! linux_chkconfig_present RTC; then
+ eerror "rtc: Your kernel lacks RealTime-Clock support!"
+ result=$((result+1))
+ fi
+ fi
+
+ if [[ $result -gt 0 ]]; then
+ echo
+ ewarn "One or more of the neccessary precondition(s) is/are not met!"
+ ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
+ echo
+
+ if [[ $result -lt 3 ]]; then
+ eerror "[$result Error(s)] Zaptel is not happy :("
+ else
+ eerror "[$result Error(s)] You're making zaptel cry :'("
+ fi
+ die "[$result] Precondition(s) not met"
+ fi
+
+ echo
+ einfo "Zaptel is happy and continues... :)"
+}
+
+src_unpack() {
+ unpack ${A}
+
+ cd ${S}
+ epatch ${FILESDIR}/${P}-gentoo.diff
+ epatch ${FILESDIR}/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
+ epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
+
+ use ukcid && \
+ epatch ${FILESDIR}/${PN}-1.2.0-ukcid.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
+
+### Configuration changes
+ local myEC
+
+ # prepare zconfig.h
+ myEC=$(select_echo_cancel)
+ if [[ -n "${myEC}" ]]; then
+ einfo "Selected echo canceller: ${myEC}"
+ # disable default first, set new selected ec afterwards
+ zconfig_disable ECHO_CAN
+ zconfig_enable ECHO_CAN_${myEC}
+ fi
+
+ # enable rtc support on 2.6
+ if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
+ einfo "Enabling ztdummy RTC support"
+ zconfig_enable USE_RTC
+ fi
+
+ # enable agressive echo surpression
+ use ecaggressive && \
+ zconfig_enable AGGRESSIVE_SUPPRESSOR
+
+ # ppp ras support
+ use zapras && \
+ zconfig_enable CONFIG_ZAPATA_PPP
+
+ # frame relay, syncppp...
+ use zapnet && \
+ zconfig_enable CONFIG_ZAPATA_NET
+
+ # zaptel watchdog
+ use watchdog && \
+ zconfig_enable CONFIG_ZAPTEL_WATCHDOG
+}
+
+src_compile() {
+ # build
+ make KVERS=${KV_FULL} \
+ KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
+
+ 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
+}
+
+src_install() {
+ make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
+ KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
+
+ dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
+ dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
+
+ # additional tools
+ dobin ztmonitor ztspeed zttest fxotune
+
+ # install all header files, several packages need the complete set
+ # (e.g. sangoma wanpipe)
+ 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
+
+ # install init script
+ newinitd ${FILESDIR}/zaptel.rc6 zaptel
+ newconfd ${FILESDIR}/zaptel.confd zaptel
+
+ # install devfsd rule file
+ insinto /etc/devfs.d
+ newins ${FILESDIR}/zaptel.devfsd zaptel
+
+ # install udev rule file
+ insinto /etc/udev/rules.d
+ newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+
+ # fix permissions if there's no udev / devfs around
+ if [[ -d ${D}/dev/zap ]]; then
+ chown -R root:dialout ${D}/dev/zap
+ chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
+ fi
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ echo
+ 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
+
+ # fix permissions if there's no udev / devfs around
+ if [[ -d ${ROOT}dev/zap ]]; then
+ chown -R root:dialout ${ROOT}dev/zap
+ chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
+ fi
+}