Author: randy Date: 2005-08-16 10:13:00 -0600 (Tue, 16 Aug 2005) New Revision: 1066
Added: trunk/cups/cups-1.1.23-testsuite_fix-1.patch trunk/nas/nas-1.7-gcc4-1.patch Log: Added CUPS test suite patch and NAS GCC-4 patch Added: trunk/cups/cups-1.1.23-testsuite_fix-1.patch =================================================================== --- trunk/cups/cups-1.1.23-testsuite_fix-1.patch 2005-08-14 13:14:31 UTC (rev 1065) +++ trunk/cups/cups-1.1.23-testsuite_fix-1.patch 2005-08-16 16:13:00 UTC (rev 1066) @@ -0,0 +1,62 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2005-08-15 +Initial Package Version: 1.1.23 +Upstream Status: Not submitted +Origin: Randy McMurchy +Description: Fix the Valgrind command, disable using the 'htmldoc' + tool and clean up the output in the test suite script + + +--- cups-1.1.23-orig/test/run-stp-tests.sh 2005-01-03 19:30:00.000000000 +0000 ++++ cups-1.1.23/test/run-stp-tests.sh 2005-08-15 04:21:24.000000000 +0000 +@@ -116,11 +116,12 @@ + + case "$usevalgrind" in + Y* | y*) +- valgrind="valgrind --tool=memcheck --logfile=/tmp/$user/log/valgrind --error-limit=no --leak-check=yes --trace-children=yes" ++ valgrind="valgrind --tool=memcheck --log-file=/tmp/$user/log/valgrind --error-limit=no --leak-check=yes --trace-children=yes" + echo "Using Valgrind; log files can be found in /tmp/$user/log..." + ;; + + *) ++ echo "Not using Valgrind" + valgrind="" + ;; + esac +@@ -428,7 +429,9 @@ + + echo "<H2>page_log</H2>" >>$strfile + echo "<PRE>" >>$strfile +-cat /tmp/$user/log/page_log >>$strfile ++if [ -f /tmp/$user/log/page_log ]; then ++ cat /tmp/$user/log/page_log >>$strfile; ++fi + echo "</PRE>" >>$strfile + + # +@@ -442,10 +445,10 @@ + htmlfile=`basename $strfile .shtml`.html + pdffile=`basename $strfile .shtml`.pdf + +-htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \ +- -f $htmlfile $strfile +-htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \ +- -f $pdffile $strfile ++#htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \ ++# -f $htmlfile $strfile ++#htmldoc --numbered --verbose --titleimage ../doc/images/cups-large.gif \ ++# -f $pdffile $strfile + + echo "" + +@@ -462,8 +465,8 @@ + echo "" + echo "See the following files for details:" + echo "" +-echo " $htmlfile" +-echo " $pdffile" ++echo " ./test/$strfile" ++#echo " $pdffile" + echo "" + + # Added: trunk/nas/nas-1.7-gcc4-1.patch =================================================================== --- trunk/nas/nas-1.7-gcc4-1.patch 2005-08-14 13:14:31 UTC (rev 1065) +++ trunk/nas/nas-1.7-gcc4-1.patch 2005-08-16 16:13:00 UTC (rev 1066) @@ -0,0 +1,254 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2005-08-16 +Initial Package Version: 1.7 +Upstream Status: Submitted +Origin: NAS mailing list - Steve McIntyre + (http://nas.codebrilliance.com/nas/nas-ml/msg01148.html) +Description: Fixes compilation issues using GCC-4 + + +--- nas-1.7.orig/clients/audio/auconvert/auconvert.c ++++ nas-1.7/clients/audio/auconvert/auconvert.c +@@ -383,7 +383,7 @@ + fatalError("Error writing output file"); + } + else +- rateConvert(in, out, numBytes, data); ++ rateConvert(in, out, numBytes, (char *)data); + + if (SoundCloseFile(out)) + fatalError("Error closing output file"); +--- nas-1.7.orig/clients/audio/auinfo/auinfo.c ++++ nas-1.7/clients/audio/auinfo/auinfo.c +@@ -26,6 +26,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <audio/audiolib.h> + +--- nas-1.7.orig/clients/audio/aupanel/aupanel.c ++++ nas-1.7/clients/audio/aupanel/aupanel.c +@@ -28,6 +28,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #ifndef SYSV + #include <audio/Aos.h> /* for string and other os stuff */ + #endif +--- nas-1.7.orig/clients/audio/auplay/auplay.c ++++ nas-1.7/clients/audio/auplay/auplay.c +@@ -30,7 +30,9 @@ + #include <unistd.h> + #include <fcntl.h> + #include <stdio.h> ++#include <stdlib.h> + #include <signal.h> ++#include <string.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/aurecord/aurecord.c ++++ nas-1.7/clients/audio/aurecord/aurecord.c +@@ -28,6 +28,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <signal.h> + #include <audio/Aos.h> /* for string and other os stuff */ + #include <audio/Afuncs.h> /* for bcopy et. al. */ +--- nas-1.7.orig/clients/audio/auwave/auwave.c ++++ nas-1.7/clients/audio/auwave/auwave.c +@@ -28,6 +28,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #ifndef SYSV + #include <audio/Aos.h> /* for string and other os stuff */ + #endif +--- nas-1.7.orig/clients/audio/examples/playFile.c ++++ nas-1.7/clients/audio/examples/playFile.c +@@ -9,6 +9,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/examples/playSimul.c ++++ nas-1.7/clients/audio/examples/playSimul.c +@@ -9,6 +9,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +@@ -48,7 +49,7 @@ + { + arg++; + argc--; +- volume = atoi(arg); ++ volume = atoi(*arg); + } + } + else if (AuSoundPlayFromFile(aud, *arg, AuNone, +--- nas-1.7.orig/clients/audio/examples/playFromBckt.c ++++ nas-1.7/clients/audio/examples/playFromBckt.c +@@ -9,6 +9,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/examples/loopBucket.c ++++ nas-1.7/clients/audio/examples/loopBucket.c +@@ -10,6 +10,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/examples/bundle.c ++++ nas-1.7/clients/audio/examples/bundle.c +@@ -17,6 +17,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/examples/recordBucket.c ++++ nas-1.7/clients/audio/examples/recordBucket.c +@@ -11,6 +11,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/examples/plyBcktAsync.c ++++ nas-1.7/clients/audio/examples/plyBcktAsync.c +@@ -7,6 +7,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> + +--- nas-1.7.orig/clients/audio/util/playbucket.c ++++ nas-1.7/clients/audio/util/playbucket.c +@@ -23,6 +23,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <audio/audiolib.h> + #include <audio/soundlib.h> +--- nas-1.7.orig/clients/audio/widgets/Slider.c ++++ nas-1.7/clients/audio/widgets/Slider.c +@@ -31,6 +31,7 @@ + #include <X11/StringDefs.h> + #include <X11/Xaw/Label.h> + #include <X11/Xaw/Scrollbar.h> ++#include <stdio.h> + #include "SliderP.h" + + static XtResource resources[] = { +--- nas-1.7.orig/server/dia/main.c ++++ nas-1.7/server/dia/main.c +@@ -52,6 +52,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <audio/audio.h> + #include <audio/Aproto.h> + #include "NasConfig.h" +--- nas-1.7.orig/server/dia/auprocess.c ++++ nas-1.7/server/dia/auprocess.c +@@ -25,6 +25,7 @@ + #define _AUPROCESS_C_ + #define OUTPUT_RANGE_CHECK + ++#include <string.h> + #include <audio/audio.h> + #include <audio/Aproto.h> + #include "au.h" +--- nas-1.7.orig/server/dia/auutil.c ++++ nas-1.7/server/dia/auutil.c +@@ -173,7 +173,7 @@ + AuCreateResourceTypes() + { + void AuFreeComponent(); +- static void freeFlow(); ++ void freeFlow(); + + auComponentType = CreateNewResourceType(AuFreeComponent); + auFlowType = CreateNewResourceType(freeFlow); +--- nas-1.7.orig/server/os/access.c ++++ nas-1.7/server/os/access.c +@@ -583,7 +583,8 @@ + AuthorizedClient(client) + ClientPtr client; + { +- int alen, family; ++ int family; ++ socklen_t alen; + #ifndef AMOEBA + struct sockaddr from; + #else +--- nas-1.7.orig/server/os/connection.c ++++ nas-1.7/server/os/connection.c +@@ -1402,7 +1402,7 @@ + struct sockaddr_dn dn; + #endif /* DNETCONN */ + } from; +- int fromlen = sizeof (from); ++ socklen_t fromlen = sizeof (from); + AuID auth_id; + + auth_id = CheckAuthorization (proto_n, auth_proto, +@@ -1480,7 +1480,7 @@ + struct sockaddr_dn dn; + #endif /* DNETCONN */ + } from; +- int fromlen; ++ socklen_t fromlen; + #endif /* TCP_NODELAY */ + + readyconnections = (((long)closure) & WellKnownConnections); +@@ -1504,7 +1504,7 @@ + readyconnections &= ~(1 << curconn); + if ((newconn = accept (curconn, + (struct sockaddr *) NULL, +- (int *)NULL)) < 0) ++ (socklen_t *)NULL)) < 0) + continue; + if (newconn > lastfdesc) + { +--- nas-1.7.orig/server/os/utils.c ++++ nas-1.7/server/os/utils.c +@@ -51,6 +51,7 @@ + #include <audio/audio.h> + #include <audio/Aos.h> + #include <stdio.h> ++#include <stdlib.h> + #include "nasconf.h" + #include "misc.h" + #include "opaque.h" + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
