rpms/isdn4k-utils/devel isdn4k-utils-CVS-2010-05-01-capi-soname.patch, NONE, 1.1 capi20.conf, 1.1, 1.2 isdn4k-utils.spec, 1.94, 1.95

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/isdn4k-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7307

Modified Files:
	capi20.conf isdn4k-utils.spec 
Added Files:
	isdn4k-utils-CVS-2010-05-01-capi-soname.patch 
Log Message:
- fix bz#566909, thanks to Louis Lagendijk
    - own LIBDIR/capi
    - fix loading of plugins
    - remove chkconfig capi off



isdn4k-utils-CVS-2010-05-01-capi-soname.patch:
 capi20.c |    4 !!!!
 1 file changed, 4 modifications(!)

--- NEW FILE isdn4k-utils-CVS-2010-05-01-capi-soname.patch ---
*** isdn4k-utils/capi20.new/capi20.c.org	2010-05-07 20:56:21.000000000 +0200
--- isdn4k-utils/capi20.new/capi20.c	2010-05-07 22:01:45.000000000 +0200
***************
*** 590,598 ****
  	psDir = opendir( pnModuleDir );
  	if ( psDir != NULL ) {
  		/* read entry by entry */
  		while ( ( psEntry = readdir( psDir ) ) != NULL )  {
! 			/* skip ".", ".." and files which do not end with "so" */
  			nLen = strlen( psEntry -> d_name );
  
  			switch ( nLen ) {
  				case 1:
--- 590,598 ----
  	psDir = opendir( pnModuleDir );
  	if ( psDir != NULL ) {
  		/* read entry by entry */
  		while ( ( psEntry = readdir( psDir ) ) != NULL )  {
! 			/* skip ".", ".." and files which do not end with "so.?" */
  			nLen = strlen( psEntry -> d_name );
  
  			switch ( nLen ) {
  				case 1:
***************
*** 605,613 ****
  						continue;
  					}
  					break;
  				default:
! 					if ( strncmp( psEntry -> d_name + nLen - 3, ".so", nLen ) ) {
  						continue;
  					}
  					break;
  			}
--- 605,613 ----
  						continue;
  					}
  					break;
  				default:
! 					if ( strncmp( psEntry -> d_name + nLen - 5, ".so.0", 4 ) ) {
  						continue;
  					}
  					break;
  			}


Index: capi20.conf
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/capi20.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- capi20.conf	4 May 2010 12:28:01 -0000	1.1
+++ capi20.conf	14 May 2010 16:05:46 -0000	1.2
@@ -1,6 +1,3 @@
-# -- Configuration -----------------------------------
-# ----------------------------------------------------
-# 
 # libcapi20 features autodetection of connected CAPI
 # devices. In case you need to select a special device
 # use the remote configuration file:
@@ -18,5 +15,4 @@
 # 
 # If this doesn't exist, the library tries the old, normal way
 # of using the local /dev/isdn/capi20.
-
-#REMOTE fritzbox 192.168.178.1
+# REMOTE fritzbox 192.168.178.1 5031


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- isdn4k-utils.spec	5 May 2010 21:42:38 -0000	1.94
+++ isdn4k-utils.spec	14 May 2010 16:05:47 -0000	1.95
@@ -6,7 +6,7 @@
 Summary: Utilities for configuring an ISDN subsystem
 Name: isdn4k-utils
 Version: 3.2
-Release: 70%{?dist}
+Release: 71%{?dist}
 License: GPLv2+ and GPL+ and MIT and BSD and zlib
 Group: Applications/System
 Url: http://www.isdn4linux.de/
@@ -43,6 +43,7 @@ Patch17: isdn4k-utils-misc-overflow-in-c
 Patch18: isdn4k-utils-sh-linux.patch
 Patch19: isdn4k-utils-autoconf-2.6.4-quoting.patch
 Patch20: isdn4k-utils-CVS-2010-05-01-capi.patch
+Patch21: isdn4k-utils-CVS-2010-05-01-capi-soname.patch
 
 Requires: udev >= 039-10.14.EL4
 Requires: hwdata >= 0.146.18.EL-1
@@ -142,6 +143,7 @@ popd
 %patch18 -p1 -b .sh-support
 %patch19 -p1 -b .quote
 %patch20 -p1 -b .capinew
+%patch21 -p1 -b .capi-soname
 
 # remove useless files
 find -type d -name "CVS" | xargs rm -rf
@@ -302,7 +304,6 @@ echo "# config files" >> %{buildroot}/et
 /sbin/ldconfig
 /sbin/chkconfig --add isdn
 /sbin/chkconfig --add capi
-/sbin/chkconfig capi off
 if ! test -s %{_datadir}/isdn/zone-de-dtag.cdb ; then
 	bzip2 -dc %{_docdir}/isdn4k-utils-3.2/zred.dtag.bz2 | \
 	/sbin/mkzonedb -d %{_datadir}/isdn/zone-de-dtag.cdb -r -
@@ -440,6 +441,7 @@ rm -rf %{buildroot}
 %dir /var/spool/vbox
 %dir /var/log/vbox
 %dir %{_datadir}/isdn
+%dir %{_libdir}/capi
 %verify(not md5 size mtime) %config(noreplace) /etc/isdn/*
 %verify(not md5 size mtime) %config(noreplace) /etc/ppp/ioptions
 %config(noreplace) /etc/ppp/peers/*
@@ -538,6 +540,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 14 2010 Than Ngo <than at redhat.com> - 3.2-71
+- fix bz#566909, thanks to Louis Lagendijk
+    - own LIBDIR/capi
+    - fix loading of plugins
+    - remove chkconfig capi off
+
 * Tue May 04 2010 Than Ngo <than at redhat.com> - 3.2-70
 - enable capi.new
 - add 40-isdn.rules, it's dropped from udev in F14 and later