|
Check-in Number:
|
5002 | |
| Date: |
2005-Feb-02 13:52:11 (local)
2005-Feb-02 12:52:11 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
Introduce a new %checkout target to devtool.conf |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/fsl/ChangeLog 1.35 -> 1.36
--- ChangeLog 2005/02/02 12:50:42 1.35
+++ ChangeLog 2005/02/02 12:52:12 1.36
@@ -8,6 +8,23 @@
CHANGELOG
+ Changes between 1.5 and 1.6b1 (02-Feb-2005)
+
+ *) Use updated OSSP lib_l2 0.9.9 (includes an updated OSSP sa 1.2.4)
+ which improves portability issues related to varargs (seen on
+ AMD64).
+ [Thomas Lotterer <thomas@lotterer.net>]
+
+ *) Use updated OSSP lib_cfg 0.9.8 which improves portability and
+ robustness. A small adjustment was necessary due to a change in
+ cfg_node_root.
+ [Thomas Lotterer <thomas@lotterer.net>]
+
+ *) Introduce a new %checkout target to devtool.conf which allows
+ easy review of what version (if tagged) of libraries was
+ embedded. Taken from OSSP lmtp2nntp.
+ [Thomas Lotterer <thomas@lotterer.net>]
+
*) Upgraded build environment to GNU shtool 2.0.1 and
GNU libtool 1.5.10.
[Thomas Lotterer <thomas@lotterer.net>]
|
|
ossp-pkg/fsl/devtool.conf 1.24 -> 1.25
--- devtool.conf 2005/02/02 12:50:42 1.24
+++ devtool.conf 2005/02/02 12:52:11 1.25
@@ -3,9 +3,29 @@
##
%checkout
+ BRANCH_L2="L2_0_9_9"
+ BRANCH_CFG="CFG_0_9_8"
+ BRANCH_PCRE=""
for name in l2 cfg pcre; do
- echo "===> lib_${name} (cvs co)"
- cvs co -d lib_${name} ${name}
+ release=BRANCH_`echo ${name} | tr [a-z] [A-Z]`
+ release=`eval echo \\$${release}`
+ if [ ".${release}" = . ]; then
+ if [ -d lib_${name}/CVS ]; then
+ echo "===> lib_${name} (cvs up HEAD)"
+ ( cd lib_${name} && cvs up -A )
+ else
+ echo "===> lib_${name} (cvs co HEAD)"
+ cvs co -A -d lib_${name} ${name}
+ fi
+ else
+ if [ -d lib_${name}/CVS ]; then
+ echo "===> lib_${name} (cvs up ${release})"
+ ( cd lib_${name} && cvs up -r${release} )
+ else
+ echo "===> lib_${name} (cvs co ${release})"
+ cvs co -r${release} -d lib_${name} ${name}
+ fi
+ fi
echo "<=== lib_${name}"
done
|
|
ossp-pkg/fsl/fsl.c 1.67 -> 1.68
--- fsl.c 2004/04/22 10:30:31 1.67
+++ fsl.c 2005/02/02 12:52:12 1.68
@@ -578,7 +578,7 @@
fsldebug(L2_LEVEL_TRACE, "processcfg() ident/facility=\"%s\", mode=%s", cpISF, mode == 0 ? "map/ident" : "default");
/* find configuration root node and check if it is a sequence and has one or more directives below it */
- if ((cfgrv = cfg_node_root(cfg, &cfgseq)) != CFG_OK) {
+ if ((cfgrv = cfg_node_root(cfg, NULL, &cfgseq)) != CFG_OK) {
(void)cfg_error(cfg, cfgrv, &cp); fsldebug(L2_LEVEL_ERROR, "processcfg: cfg_node_root() failed with error %s (%d)", cp, cfgrv); CU(FSL_ERR_CUS); }
/* only dump once */
|
|
