1 |
rajiv 07/12/25 06:26:12 |
2 |
|
3 |
Added: zaptel-1.2.22.1-gentoo.diff digest-zaptel-1.2.22.1 |
4 |
Log: |
5 |
version bump, bug #198503, #201665. florz patched dropped until we can get a clean version. |
6 |
(Portage version: 2.1.4_rc11) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: zaptel-1.2.22.1-gentoo.diff |
15 |
=================================================================== |
16 |
diff -uNr zaptel-1.2.22.1/build_tools/genmodconf zaptel-1.2.22.1.gentoo/build_tools/genmodconf |
17 |
--- zaptel-1.2.22.1/build_tools/genmodconf 2007-07-11 14:58:09.000000000 -0400 |
18 |
+++ zaptel-1.2.22.1.gentoo/build_tools/genmodconf 2007-12-23 18:21:29.000000000 -0500 |
19 |
@@ -79,20 +79,6 @@ |
20 |
|
21 |
echo Building ${target}... |
22 |
|
23 |
-if [ "${1}" = "linux24" ]; then |
24 |
- for mod in ${3}; do |
25 |
- if ! grep -q "post-install ${mod} " ${target}; then |
26 |
- echo "post-install ${mod} /sbin/ztcfg" >> ${target} |
27 |
- fi |
28 |
- done |
29 |
-elif [ "${1}" = "linux26" ]; then |
30 |
- for mod in ${3}; do |
31 |
- if ! grep -q "install ${mod} " ${target}; then |
32 |
- echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target} |
33 |
- fi |
34 |
- done |
35 |
-fi |
36 |
- |
37 |
if [ -z "${combined}" ]; then |
38 |
echo "***" |
39 |
echo "*** WARNING:" |
40 |
diff -uNr zaptel-1.2.22.1/build_tools/genudevrules zaptel-1.2.22.1.gentoo/build_tools/genudevrules |
41 |
--- zaptel-1.2.22.1/build_tools/genudevrules 2007-01-31 12:27:30.000000000 -0500 |
42 |
+++ zaptel-1.2.22.1.gentoo/build_tools/genudevrules 2007-12-23 18:24:05.000000000 -0500 |
43 |
@@ -22,10 +22,10 @@ |
44 |
|
45 |
cat <<EOF |
46 |
# zaptel devices with ownership/permissions for running as non-root |
47 |
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
48 |
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
49 |
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
50 |
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
51 |
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
52 |
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660" |
53 |
+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660" |
54 |
+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660" |
55 |
+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660" |
56 |
+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660" |
57 |
+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660" |
58 |
+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660" |
59 |
EOF |
60 |
diff -uNr zaptel-1.2.22.1/Makefile zaptel-1.2.22.1.gentoo/Makefile |
61 |
--- zaptel-1.2.22.1/Makefile 2007-10-05 15:45:31.000000000 -0400 |
62 |
+++ zaptel-1.2.22.1.gentoo/Makefile 2007-12-23 21:56:57.000000000 -0500 |
63 |
@@ -108,7 +108,7 @@ |
64 |
|
65 |
INSTALL_PREFIX := /usr |
66 |
|
67 |
-CFLAGS+=-I. -O4 -g -fPIC -Wall |
68 |
+CFLAGS+=-I. -g -Wall |
69 |
ifneq (,$(findstring ppc,$(MACHINE))) |
70 |
CFLAGS += -fsigned-char |
71 |
KFLAGS += -msoft-float -fsigned-char |
72 |
@@ -391,7 +391,7 @@ |
73 |
else # DYNFS |
74 |
ifdef UDEVRULES |
75 |
install -d $(DESTDIR)/etc/udev/rules.d |
76 |
- build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules |
77 |
+ build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules |
78 |
else # !UDEVRULES |
79 |
@echo "**** Dynamic filesystem detected -- not creating device nodes" |
80 |
endif |
81 |
@@ -460,11 +460,10 @@ |
82 |
rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o |
83 |
endif |
84 |
rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o |
85 |
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : |
86 |
|
87 |
install-libs: libs |
88 |
install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) |
89 |
- [ `id -u` = 0 ] && /sbin/ldconfig || : |
90 |
+ [ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || : |
91 |
rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO) |
92 |
ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \ |
93 |
$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER) |
94 |
|
95 |
|
96 |
|
97 |
1.1 net-misc/zaptel/files/digest-zaptel-1.2.22.1 |
98 |
|
99 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/digest-zaptel-1.2.22.1?rev=1.1&view=markup |
100 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/files/digest-zaptel-1.2.22.1?rev=1.1&content-type=text/plain |
101 |
|
102 |
Index: digest-zaptel-1.2.22.1 |
103 |
=================================================================== |
104 |
MD5 ede315067f70d7a202a081941155c6e9 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 |
105 |
RMD160 808862df63edf85997753e1e857cc907c54f2b60 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 |
106 |
SHA256 d083b6529e34c3192e91f34b68c542106ebaa5e3046d816061709297061d3576 bristuff-0.3.0-PRE-1y-l.tar.gz 300381 |
107 |
MD5 835d57401808b6c47b4b31c9e8945240 zaptel-1.2.22.1.tar.gz 3602765 |
108 |
RMD160 ffe5173ddcf6bc8ddaaa1ef0e2b4f1f42ad06d2b zaptel-1.2.22.1.tar.gz 3602765 |
109 |
SHA256 762c593ceaa8b2b910ce4f9edea9be087d88f4453a99a004a78abac6e2ef31fd zaptel-1.2.22.1.tar.gz 3602765 |
110 |
|
111 |
|
112 |
|
113 |
-- |
114 |
gentoo-commits@g.o mailing list |