[patch] gentoo patch

zaptel-1.2.23-gentoo.diff (text/plain), 2.55 KB, created by Thomas Stein on 2008-01-17 09:59:42 UTC

--- zaptel-1.2.23/build_tools/genmodconf	2007-07-11 20:58:09.000000000 +0200
+++ zaptel-1.2.23.gentoo/build_tools/genmodconf	2008-01-17 10:13:28.613190366 +0100
@@ -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:"
--- zaptel-1.2.23/Makefile	2007-12-11 09:50:21.000000000 +0100
+++ zaptel-1.2.23.gentoo/Makefile	2008-01-17 10:32:17.208614044 +0100
@@ -108,13 +108,13 @@
 
 INSTALL_PREFIX	:= /usr
 
-CFLAGS+=-I. -O4 -g -fPIC -Wall
+CFLAGS+=-I. -O4 -g -Wall
 ifneq (,$(findstring ppc,$(MACHINE)))
   CFLAGS	+= -fsigned-char
   KFLAGS	+= -msoft-float -fsigned-char
 endif
 ifneq (,$(findstring x86_64,$(MACHINE)))
-  CFLAGS	+= -m64
+  CFLAGS	+= -m64 -fPIC
   KFLAGS	+= -mcmodel=kernel
 endif
 KFLAGS:=-I$(KINCLUDES) -O6
@@ -394,7 +394,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
@@ -464,11 +464,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)
--- zaptel-1.2.23/build_tools/genudevrules	2007-12-16 18:38:15.000000000 +0100
+++ zaptel-1.2.23.gentoo/build_tools/genudevrules	2008-01-17 10:47:07.743594193 +0100
@@ -31,5 +31,5 @@
 KERNEL${match}"zap[0-9]*", NAME="zap/%n"
 
 # zaptel devices with ownership/permissions for running as non-root
-SUBSYSTEM=="zaptel",  OWNER="asterisk", GROUP="asterisk", MODE="0660"
+SUBSYSTEM=="zaptel",  OWNER="asterisk", GROUP="dialout", MODE="0660"
 EOF