Revision: 6317
http://ipcop.svn.sourceforge.net/ipcop/?rev=6317&view=rev
Author: owes
Date: 2012-02-05 16:47:59 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Also build capiinfo. Change default prefix to /usr for capiinit (same as other
tools/libs). Need to include libcapi.so* into ISO, otherwise capiplugin will
segfault when loaded.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/capi4k-utils
ipcop/trunk/lfs/capi4k-utils
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
Modified: ipcop/trunk/config/rootfiles/common/capi4k-utils
===================================================================
--- ipcop/trunk/config/rootfiles/common/capi4k-utils 2012-02-04 20:58:34 UTC
(rev 6316)
+++ ipcop/trunk/config/rootfiles/common/capi4k-utils 2012-02-05 16:47:59 UTC
(rev 6317)
@@ -11,16 +11,19 @@
#etc/ppp/peers/isdn/otelo
#etc/ppp/peers/isdn/talkline
#sbin/avmcapictrl
-#sbin/capiinit
+usr/bin/capiinfo
#usr/include/capi20.h
#usr/include/capicmd.h
#usr/include/capiutils.h
#usr/lib/libcapi20.la
-#usr/lib/libcapi20.so
-#usr/lib/libcapi20.so.3
-#usr/lib/libcapi20.so.3.0.4
+# do NOT delete libcapi20.so, pppd plugin segfaults when symlink is missing!
+usr/lib/libcapi20.so
+usr/lib/libcapi20.so.3
+usr/lib/libcapi20.so.3.0.4
#usr/lib/libcapi20dyn.a
usr/lib/pppd/2.4.5/capiplugin.so
usr/lib/pppd/2.4.5/userpass.so
#usr/share/man/man8/avmcapictrl.8
+#usr/share/man/man8/capiinfo.8
#usr/share/man/man8/capiplugin.8
+usr/sbin/capiinit
Modified: ipcop/trunk/lfs/capi4k-utils
===================================================================
--- ipcop/trunk/lfs/capi4k-utils 2012-02-04 20:58:34 UTC (rev 6316)
+++ ipcop/trunk/lfs/capi4k-utils 2012-02-05 16:47:59 UTC (rev 6317)
@@ -87,6 +87,9 @@
cd $(DIR_APP) && patch -Np0 -i
$(DIR_PATCHES)/capi4k-utils-20050718-msg2str-safety.diff
cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/capi4k-utils-20050718-size_t.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ppp-2.4.5.patch
+ # Fix a typo (?) in capiinit configure and set default prefix to /usr
+ cd $(DIR_APP)/capiinit && sed -i -e
's/^CONFIG_SBINDIR.*=/CONFIG_SBINDIR=/' \
+ -e
's/^ac_default_prefix=.*/ac_default_prefix=\/usr/' configure
# Fix malloc and free implicit declaration
cd $(DIR_APP)/capi20 && sed -i -e 's:include <sys/time.h>:include
<sys/time.h>\n#include <sys/types.h>\n#include <stdlib.h>:' capi20.h
# Fix undefined reference to `__stack_chk_fail_local'
@@ -108,6 +111,7 @@
cd $(DIR_APP)/capi20 && ./configure --disable-static && make install
cd $(DIR_APP)/pppdcapiplugin && make install PPPVERSIONS=$(PPPVERSIONS)
+ cd $(DIR_APP)/capiinfo && ./configure && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-02-04 20:58:34 UTC
(rev 6316)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2012-02-05 16:47:59 UTC
(rev 6317)
@@ -77,8 +77,13 @@
/bin/bash
##
## capi4k-utils-2005-07-18
+/usr/bin/capiinfo
+/usr/lib/libcapi20.so
+/usr/lib/libcapi20.so.3
+/usr/lib/libcapi20.so.3.0.4
/usr/lib/pppd/2.4.5/capiplugin.so
/usr/lib/pppd/2.4.5/userpass.so
+/usr/sbin/capiinit
##
## coreutils-8.15
/bin/cat
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
