diff options
| author |   Rajiv Aaron Manglani <rajiv@gentoo.org> | 2007-12-25 06:26:12 +0000 |
|---|---|---|
| committer | Rajiv Aaron Manglani <rajiv@gentoo.org> | 2007-12-25 06:26:12 +0000 |
| commit | a94dc7a580558da184da46c3ad9e042b32e8a8cd (patch) | |
| tree | b32215f499b837c03ae44814f86781262d6426a9 /net-misc/zaptel/files | |
| parent | WXRC loving now in eselect-wxwidgets-0.7-r1 (diff) | |
| download | gentoo-2-a94dc7a580558da184da46c3ad9e042b32e8a8cd.tar.gz gentoo-2-a94dc7a580558da184da46c3ad9e042b32e8a8cd.tar.bz2 gentoo-2-a94dc7a580558da184da46c3ad9e042b32e8a8cd.zip | |
version bump, bug #198503, #201665. florz patched dropped until we can get a clean version.
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'net-misc/zaptel/files')
| -rw-r--r-- | net-misc/zaptel/files/digest-zaptel-1.2.22.1 | 6 | ||||
| -rw-r--r-- | net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff | 78 |
2 files changed, 84 insertions, 0 deletions
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.22.1 b/net-misc/zaptel/files/digest-zaptel-1.2.22.1 new file mode 100644 index 000000000000..d507164aeef6 --- /dev/null +++ b/net-misc/zaptel/files/digest-zaptel-1.2.22.1 @@ -0,0 +1,6 @@ +MD5 ede315067f70d7a202a081941155c6e9 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 +RMD160 808862df63edf85997753e1e857cc907c54f2b60 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 +SHA256 d083b6529e34c3192e91f34b68c542106ebaa5e3046d816061709297061d3576 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 +MD5 835d57401808b6c47b4b31c9e8945240 zaptel-1.2.22.1.tar.gz 3602765 +RMD160 ffe5173ddcf6bc8ddaaa1ef0e2b4f1f42ad06d2b zaptel-1.2.22.1.tar.gz 3602765 +SHA256 762c593ceaa8b2b910ce4f9edea9be087d88f4453a99a004a78abac6e2ef31fd zaptel-1.2.22.1.tar.gz 3602765 diff --git a/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff new file mode 100644 index 000000000000..eaf7f1dbd767 --- /dev/null +++ b/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff @@ -0,0 +1,78 @@ +diff -uNr zaptel-1.2.22.1/build_tools/genmodconf zaptel-1.2.22.1.gentoo/build_tools/genmodconf +--- zaptel-1.2.22.1/build_tools/genmodconf 2007-07-11 14:58:09.000000000 -0400 ++++ zaptel-1.2.22.1.gentoo/build_tools/genmodconf 2007-12-23 18:21:29.000000000 -0500 +@@ -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 [ -z "${combined}" ]; then + echo "***" + echo "*** WARNING:" +diff -uNr zaptel-1.2.22.1/build_tools/genudevrules zaptel-1.2.22.1.gentoo/build_tools/genudevrules +--- zaptel-1.2.22.1/build_tools/genudevrules 2007-01-31 12:27:30.000000000 -0500 ++++ zaptel-1.2.22.1.gentoo/build_tools/genudevrules 2007-12-23 18:24:05.000000000 -0500 +@@ -22,10 +22,10 @@ + + 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}"zaptranscode", NAME="zap/transcode", 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}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660" ++KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660" + EOF +diff -uNr zaptel-1.2.22.1/Makefile zaptel-1.2.22.1.gentoo/Makefile +--- zaptel-1.2.22.1/Makefile 2007-10-05 15:45:31.000000000 -0400 ++++ zaptel-1.2.22.1.gentoo/Makefile 2007-12-23 21:56:57.000000000 -0500 +@@ -108,7 +108,7 @@ + + INSTALL_PREFIX := /usr + +-CFLAGS+=-I. -O4 -g -fPIC -Wall ++CFLAGS+=-I. -g -Wall + ifneq (,$(findstring ppc,$(MACHINE))) + CFLAGS += -fsigned-char + KFLAGS += -msoft-float -fsigned-char +@@ -391,7 +391,7 @@ + else # DYNFS + ifdef UDEVRULES + install -d $(DESTDIR)/etc/udev/rules.d +- build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules ++ build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules + else # !UDEVRULES + @echo "**** Dynamic filesystem detected -- not creating device nodes" + endif +@@ -460,11 +460,10 @@ + rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o + endif + rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o +- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : + + install-libs: libs + install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) +- [ `id -u` = 0 ] && /sbin/ldconfig || : ++ [ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || : + rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO) + ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ + $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) |