version bump thanks to kolla and stkn for help, clean up old

(Portage version: 2.1.2_pre2-r1)

3 files changed, 121 insertions, 0 deletions

diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.9.1 b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
new file mode 100644
index 000000000000..9f4750b3466b
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.9.1
@@ -0,0 +1,8 @@
+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
+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
+RMD160 caf2ad931e2ae439500805a6ca4376dc8083de5a zaptel-1.2.9.1.tar.gz 1255412
+SHA256 7def44c259352397af2ad80f3c0eb103ff640ffbc7c95f37c3802fee75c10ede zaptel-1.2.9.1.tar.gz 1255412
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch b/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
new file mode 100644
index 000000000000..485a337e36ca
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch
@@ -0,0 +1,10 @@
+--- zaptel-1.2.9.1/wct4xxp/Kbuild.orig	2006-09-28 01:47:38.000000000 +0000
++++ zaptel-1.2.9.1/wct4xxp/Kbuild	2006-09-28 01:47:53.000000000 +0000
+@@ -2,6 +2,7 @@
+ # but we need to be able to support older verions as well
+ host-progs := fw2h
+ hostprogs-y := fw2h
++fw2h-objs := fw2h.o
+ 
+ obj-m += wct4xxp.o
+ 
diff --git a/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
new file mode 100644
index 000000000000..34ac1558b84e
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.9.1-gentoo.diff
@@ -0,0 +1,103 @@
+diff -Nru zaptel-1.2.9.1.orig/Makefile zaptel-1.2.9.1/Makefile
+--- zaptel-1.2.9.1.orig/Makefile	2006-09-09 01:49:43.000000000 +0200
++++ zaptel-1.2.9.1/Makefile	2006-09-15 02:14:35.000000000 +0200
+@@ -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,20 @@
+ 	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 -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
++	install -D -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 -Nru zaptel-1.2.9.1.orig/build_tools/genmodconf zaptel-1.2.9.1/build_tools/genmodconf
+--- zaptel-1.2.9.1.orig/build_tools/genmodconf	2006-05-23 19:51:00.000000000 +0200
++++ zaptel-1.2.9.1/build_tools/genmodconf	2006-09-15 02:13:37.000000000 +0200
+@@ -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 -Nru zaptel-1.2.9.1.orig/build_tools/genudevrules zaptel-1.2.9.1/build_tools/genudevrules
+--- zaptel-1.2.9.1.orig/build_tools/genudevrules	2006-05-17 18:49:46.000000000 +0200
++++ zaptel-1.2.9.1/build_tools/genudevrules	2006-09-15 02:12:19.000000000 +0200
+@@ -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