December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit framebuffer
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package framebuffer checked in at Thu Dec 7 20:11:57 CET 2006. -------- --- framebuffer/framebuffer.changes 2006-01-25 21:46:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/framebuffer/framebuffer.changes 2006-11-30 22:41:24.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 30 22:40:38 CET 2006 - sndirsch(a)suse.de + +- endless loop in frambuffer start script with dualhead, i.e. more + than one grafic card (Bug #191257) + +------------------------------------------------------------------- Old: ---- framebuffer-2005.tar.bz2 New: ---- framebuffer-2006.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ framebuffer.spec ++++++ --- /var/tmp/diff_new_pack.U6MD6h/_old 2006-12-07 20:11:49.000000000 +0100 +++ /var/tmp/diff_new_pack.U6MD6h/_new 2006-12-07 20:11:49.000000000 +0100 @@ -1,24 +1,24 @@ # -# spec file for package framebuffer (Version 2005) +# spec file for package framebuffer (Version 2006) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: framebuffer Url: http://nowhere.com -License: Other License(s), see package, GPL +License: GNU General Public License (GPL), Other License(s), see package Group: System/X11/Utilities Autoreqprov: on -Version: 2005 -Release: 3 +Version: 2006 +Release: 1 PreReq: %insserv_prereq %fillup_prereq -Summary: Perform the appropriate settings for the framebuffer device +Summary: Make the Appropriate Settings for the Framebuffer Device Source: %name-%version.tar.bz2 Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,10 +41,8 @@ %install mkdir -p $RPM_BUILD_ROOT/etc/init.d \ - $RPM_BUILD_ROOT/usr/sbin \ - $RPM_BUILD_ROOT/var/adm/fillup-templates + $RPM_BUILD_ROOT/usr/sbin install -m 755 framebufferset $RPM_BUILD_ROOT/etc/init.d -install -m 644 sysconfig.framebuffer $RPM_BUILD_ROOT/var/adm/fillup-templates ln -snf ../../etc/init.d/framebufferset $RPM_BUILD_ROOT/usr/sbin/rcframebufferset cp $RPM_SOURCE_DIR/COPYING . @@ -56,13 +54,25 @@ %doc README.framebuffer COPYING /etc/init.d/framebufferset /usr/sbin/rcframebufferset -/var/adm/fillup-templates/* %post %{fillup_and_insserv -f -y framebufferset} %{fillup_only -n framebuffer} +if [ -f /etc/sysconfig/framebuffer ]; then + rm -f /etc/sysconfig/framebuffer +fi +/etc/init.d/framebufferset init > /dev/null 2>&1 + + +%postun +if [ -f /etc/sysconfig/framebuffer ]; then + rm -f /etc/sysconfig/framebuffer +fi %changelog -n framebuffer +* Thu Nov 30 2006 - sndirsch(a)suse.de +- endless loop in frambuffer start script with dualhead, i.e. more + than one grafic card (Bug #191257) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Oct 16 2005 - sndirsch(a)suse.de ++++++ framebuffer-2005.tar.bz2 -> framebuffer-2006.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/framebuffer-2005/README.framebuffer new/framebuffer-2006/README.framebuffer --- old/framebuffer-2005/README.framebuffer 2005-09-27 21:56:39.000000000 +0200 +++ new/framebuffer-2006/README.framebuffer 2006-08-23 20:22:04.000000000 +0200 @@ -1,6 +1,6 @@ General information on package framebuffer -Copyright Dieter Jurzitza / 2005 dieter.jurzitza(a)t-online.de +Copyright Dieter Jurzitza / 2005, 2006 dieter.jurzitza(a)t-online.de Please send bugs / suggestions / whatsoever to me directly. This is a package to perform the appropriate settings for the framebuffer @@ -39,26 +39,40 @@ size=XXX to the actual size of the graphics card's memory. This package contains of a script entitled framebufferset. It parses at a first -step the output of lspci for a string " VGA ". Then th e output is further +step the output of lspci for the string " VGA ". Then the output is further parsed for "Memory at " entries. Those lines are analyzed, the address values -and the size values are taken out, but only if the size is in Megabytes. +and the size values are taken out, but only if the size is in Megabytes or +Gigabytes. Only lines not containing "disabled" strings are recognized. -The reading ends as soon as an empty line is reached in the lspci-output. +The reading is continued until the end of the lspci - output is reached. If +multiple VGA - entries are found, they are parsed subsequentially and the +parameters (base-address and memory-size) are stored in an array called +RETVAL. The reading for an individual VGA-entry ends as soon as an empty line +is reached in the lspci-output. So we have a variable called RETVAL that contains a list of addresses / memory sizes. -In a next step the contents of /proc/mtrr is parsed to find the address entries -we have stored in RETVAL (precisely in the even entries of RETVAL). +The first entry of RETVAL, i. e. ${RETVAL[0]} contains twice the number of +"Memory at" entries of the individual VGA-cards that have been detected in the +system. This is due to the fact that each "Memory at" entry provides two +values (address & memory size). + +In a next step the contents of /proc/mtrr is parsed to match the address entries +we have stored in RETVAL (precisely in the odd entries of RETVAL). If we find a corresponding line we (hopefully) know what to modify. The reg0X -entry of that line is analyzed so we get the "X", and the base entry is set to +entry of that line is parsed, to. So we get the "X", and the base entry is set to the address we found to be related. -The size entry is taken from the variable FRAMEBUFFERSIZE that may be +The size entry is taken from the array - variable FRAMEBUFFERSIZE that may be adjusted by yast2 -> System -> Edit for /etc/sysconfig-Files -> Hardware -> Framebuffer -> Memory -> FRAMEBUFFERSIZE. -I use an entry of 128 (M) there. +At first start the array - variable is initialized with the values that have +been found by lspci -v. + +I (personally) use an entry of 128 (M) there, knowing the memory size of my +graphics card. The script uses the previously determined values to perform the following things: @@ -81,5 +95,20 @@ No more error messages related to overlapping mtrr sizes can be found any more. Further documentation can be taken from /usr/src/linux/Documentation/mtrr.txt. +If the sizes in /proc/mtrr and in the output of lspci -v are identical, a +corresponding message is printed. In case of an error the script exits prior +to modifying /proc/mtrr. This is done to be at the save side. + +If you run into problems, simply delete the file /etc/sysconfig/framebuffer; +in this case it will be regenerated from scratch. If the system +configuration is changing, the file is regenerated, too and the original +file is stored away in /usr/share/doc/packages/framebuffer, the current date +is appended in order to separate the different backups. + There is NO warranty for this to function correctly, I tested it with a small -number of devices with success. +number of devices with success. The endless loop with more than one graphics +card should be gone, the script is prepared now to handle an arbitrary +number of graphics cards in parallel. + + +Dieter Jurzitza / August 2006 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/framebuffer-2005/framebufferset new/framebuffer-2006/framebufferset --- old/framebuffer-2005/framebufferset 2005-09-27 21:56:46.000000000 +0200 +++ new/framebuffer-2006/framebufferset 2006-09-02 14:45:45.000000000 +0200 @@ -1,5 +1,7 @@ #!/bin/sh -# Copyright (c) 2005 Dieter Jurzitza, Germany. +# Copyright (c) 2005, 2006 Dieter Jurzitza, Germany. +# +# updated to handle arbitrary numbers of graphics cards in the PC: August 2006 # # Author: Dr. Ing. Dieter Jurzitza <dieter.jurzitza(a)t-online.de> # @@ -22,14 +24,13 @@ # some variables we need in the script AWK=/bin/awk -SED=/bin/sed -GREP=/bin/grep CAT=/bin/cat LSPCI="/sbin/lspci" LSPCIOPTS="-v" MTRR="/proc/mtrr" CONFIGFILE=/etc/sysconfig/framebuffer +DOCPATH=/usr/share/doc/packages/framebuffer declare -a RETVAL declare -a RESULT @@ -37,105 +38,268 @@ # First reset status of this service rc_reset -echo -n "Verify the apropriate mtrr setting" -if [ ! -f ${MTRR} ]; then - echo -n " ${MTRR} not found " - echo "${rc_failed}" - exit 1 -fi - -if [ ! -f ${CONFIGFILE} ];then - echo -n " ${CONFIGFILE} not found " - echo "${rc_failed}" - exit 2 -fi - -# source config file -. ${CONFIGFILE} - -# Analyze the output of lspci with regard to the graphics card's attributes. We search for " VGA ". Having found this -# we search for the String "Memory at ", what in turn gives the address value. K-Byte values (/K/) are ignored. -# For everything valid we get a printout 0xBASEADDR MEMSZ, what gets stored into RETVAL. num is our eventcounter: each -# time we find a valid Memory entry num is increased by two. At the very end we print num. So our array contains pairs of -# addresses and memory sizes until the last value which represents the total size of the array RETVAL. -# The final sed removes the [size= XXX] from the actual XXX-size values. - -RETVAL=(`${LSPCI} ${LSPCIOPTS} |\ - ${AWK} '{if (match($0, " VGA ")){ \ - num=0; \ - A=getline; \ - while(A != ""){ \ - if (match(A, "Memory at ")){ \ - split(A,B, " "); \ - sub(/M/, "", B[6]); \ - if (sub(/K/, "", B[6])){ \ - break; \ - } \ - printf("0x%s %s ", B[3], B[6]); \ - num+=2; \ - }; \ - getline A; \ - } \ - printf(" %d END", num); \ - } \ - }' | \ -sed 's/\[size=//g; s/\]//g'`) - -# -# Now let us search for the END entry in RETVAL[i]. END marks the end of the array. Since the mtrr's cannot be that many ones we -# do not search for more than 100 entries (will never be reached). -# -for (( i=0 ; $i != 100 ; i=`expr $i + 1` )) ; do - if [ "${RETVAL[$i]}" = "END" ]; then - if [ $i != "0" ]; then - i=`expr $i - 1`; - fi - break; - fi -done - -# Now we have to look into $MTRR. There are settings for the graphics card we find by looking at the address values. -# Those addresses that are identical to the ones from the graphics card are the ones we need. -# However, one cannot rely on the return value for memory of lspci. Therefore we introduced an environment variable -# defined in /etc/sysconfig/framebuffer that needs to be set by the user. It is called FRAMEBUFFERSIZE and can have values -# from 16 to 2048 [MB]. - -for (( j=0 ; "$j" != "$i" ; j=`expr $j + 2` )) ; do - RESULT=(`${CAT} ${MTRR} | ${GREP} ${RETVAL[$j]} | $SED 's/://g; s/[a-z]//g; s/[A-Z]//g' | ${AWK} '{printf("%d %d", $1, $5)}'`) - if [ "${RESULT[1]}" != "${RETVAL[`expr $j + 1`]}" ]; then - if [ "${FRAMEBUFFERSIZE}" = "16" ]; then - MEMSIZE=1000000 - elif [ "${FRAMEBUFFERSIZE}" = "32" ]; then - MEMSIZE=2000000 - elif [ "${FRAMEBUFFERSIZE}" = "64" ]; then - MEMSIZE=4000000 - elif [ "${FRAMEBUFFERSIZE}" = "128" ]; then - MEMSIZE=8000000 - elif [ "${FRAMEBUFFERSIZE}" = "256" ]; then - MEMSIZE=10000000 - elif [ "${FRAMEBUFFERSIZE}" = "512" ]; then - MEMSIZE=20000000 - elif [ "${FRAMEBUFFERSIZE}" = "1024" ]; then - MEMSIZE=40000000 - elif [ "${FRAMEBUFFERSIZE}" = "2048" ]; then - MEMSIZE=80000000 - else - MEMSIZE=INVALID - fi - fi - - if [ "${MEMSIZE}" != "INVALID" -a "${MEMSIZE}" != "" ]; then - echo "disable=${RESULT[0]}" > ${MTRR} - echo "base=${RETVAL[$j]} size=0x${MEMSIZE} type=write-combining" > ${MTRR} - echo "${rc_done}" - fi -done - -if [ "${MEMSIZE}" = "INVALID" ]; then - echo -n " no valid memory size has been found!" - echo ${rc_failed} -elif [ "${MEMSIZE}" = "" ]; then - echo -n " nothing to do on this system, sizes are identical!" - echo "${rc_done}" -fi +###################################### START FUNCTION DECLARATIONS ###################################### +function checkmtrr(){ + if [ ! -f ${MTRR} ]; then + echo -n " ${MTRR} not found " + echo "$rc_failed" + return 1 + fi +} + +function makeconfigfile (){ + TMPNAME=`mktemp /tmp/RETVALBUF.XXXXXXXXXXXXXXXX` + for ((i=1; i<${RETVAL[0]}; i+=2)); do + if [ "1" != "$i" ]; then + echo -n " " >> ${TMPNAME} + fi + echo -n "${RETVAL[$i]}" >> ${TMPNAME} + done + echo "## Path: Hardware/Framebuffer/Memory" > ${CONFIGFILE} + echo "## Description: Framebuffer-sizes" >> ${CONFIGFILE} + echo "## Type: string" >> ${CONFIGFILE} + echo "##" >> ${CONFIGFILE} + echo "## DO NEVER CHANGE THE NEXT ENTRY MANUALLY" >> ${CONFIGFILE} + echo "## INITSTRING=${INITSTRING}" >> ${CONFIGFILE} + echo "## DO NEVER CHANGE THE PREVIOUS ENTRY MANUALLY" >> ${CONFIGFILE} + echo "##" >> ${CONFIGFILE} + echo "# The size of the framebuffer memory in Megabyte we want to allocate in /proc/mtrr" >> ${CONFIGFILE} + echo "# This can vary between 16 and 16384 (MB) in factors of 2 (16,32,64 ... 16384) for value a, b, c ..." >> ${CONFIGFILE} + echo "# Prior to changing anything you SHOULD take a look into" >> ${CONFIGFILE} + echo "# /usr/share/doc/packages/framebuffer/README.framebuffer" >> ${CONFIGFILE} + echo "# Entries of "-1" mean that there are unused indexes of memory ranges in /proc/mtrr" >> ${CONFIGFILE} + echo "# Entries of "NOVGA" refer to blocks that are not related to a VGA card within /proc/mtrr." >> ${CONFIGFILE} + echo "# Only entries that belong to a VGA card may be changed." >> ${CONFIGFILE} + echo "#" >> ${CONFIGFILE} + # This AWK-script generates the FRAMEBUFFERSIZE-Entry in our configfile + ${AWK} -v infile=${TMPNAME} '{ \ + getline line < infile; \ + printf("FRAMEBUFFERSIZE=\""); \ + max=0; \ + do { \ + baseaddr=$2; \ + gsub(/[^0-9 ]/, "", $0); \ + i=$1+0; \ + num[i]=i; \ + if (match(line, baseaddr)){ \ + memsize[i]=$4; \ + } \ + else { \ + memsize[i]="NOVGA"; \ + } \ + if( i > max){max=i;} \ + } while (getline >0 ); \ + for (i=0; i<=max; i++){ \ + if (""==num[i]){ \ + num[i]=i; \ + memsize[i]="-1"; \ + } \ + if (max != i){ \ + printf("%s ", memsize[i]); \ + } \ + else { \ + printf("%s\"\n", memsize[i]); \ + } \ + } \ + }' ${MTRR} >> ${CONFIGFILE} + rm -f ${TMPNAME} +} + +# check whether the configfile exists, if so read it and check whether there was a change in configuration - then we have to recreate it +function checkconfigfile () { + # This is for the initial setup of the configfile + if [ ! -f ${CONFIGFILE} ]; then + echo -n " ${CONFIGFILE} does not exist - create new one .." + makeconfigfile + echo -n ".. done " + echo "$rc_failed" + return 1 + fi + + # ok - we have it - source it! + . ${CONFIGFILE} + + # check whether the current configuration as returned by () and the configuration in the configfile are identical. + CURRSTRING=`cat ${CONFIGFILE} | \ + ${AWK} '{ \ + if (sub("## INITSTRING=", "", $0)){ \ + printf("%s", $0); \ + } \ + }'` + + if [ "${INITSTRING}" != "${CURRSTRING}" ]; then + echo -n " PCI-bus config changed .." + FILENAME=`basename ${CONFIGFILE}` + FILENAME=${FILENAME}-`date +%H.%M-%d.%m.%Y`.save + echo -n "... saving ${CONFIGFILE} to ${DOCPATH}/${FILENAME} .." + cp -p ${CONFIGFILE} ${DOCPATH}/${FILENAME} + echo -n ".. ready .." + echo -n ".. creating new configfile .." + makeconfigfile + echo -n ".. done " + echo "$rc_failed" + return 1 + fi +} + +function fillarray (){ + # Analyze the output of lspci with regard to the graphics card's attributes. We search for " VGA ". Having found this + # we search for the String "Memory at ", what in turn gives the address value. K-Byte values (/K/) are ignored. + # For everything valid we get a printout 0xBASEADDR MEMSZ, what gets stored into RETVAL. num is our eventcounter: each + # time we find a valid Memory entry num is increased twice. At the very end we assign data[0] the value of num. So our + # array contains pairs of addresses and memory sizes starting off 1, whereas arrayindex 0 tells us how many entries to + # expect within the array. + RETVAL=(`${LSPCI} ${LSPCIOPTS} | ${AWK} '{ \ + num=0; \ + A=$0; \ + # read until the end of the input file + do { \ + if (match(A, " VGA ")){ \ + # if we found " VGA " things get interesting + if ((getline A) <= 0){exit}; \ + # a blank line is signalizing the end of a description block of lspci! + while(A != ""){ \ + if (match(A, "Memory at ")){ \ + split(A,B, " "); \ + if ((sub(/K/, "", B[6]))||(match(B[6], "disabled"))) { \ + break; \ + }; \ + # here we assume MByte to be defined. + if (match (B[6], "M]")){ \ + gsub(/[^0-9]/, "", B[6]); \ + num++; \ + data[num]="base=0x"B[3]; \ + num++; \ + data[num]=B[6]; \ + }; \ + # This one cares for GByte. + if (match (B[6], "G]")){ \ + gsub(/[^0-9]/, "", B[6]); \ + num++; \ + data[num]="base=0x"B[3]; \ + num++; \ + data[num]=B[6]*1024; \ + }; \ + }; \ + if ((getline A) <= 0){exit;}; \ + }; \ + }; \ + } while ((getline A) > 0); \ + # data[0] contains information how many entries we have found! + data[0]=num; \ + # print the entire array so it is available in the script "above" + for (i=0; i<=num; i++){ \ + printf("%s ", data[i]); \ + } \ + printf("\n"); \ + }'`) + # Here we store what can be seen within lspci into INITSTRING. As long as this entry remains constant, we can be sure + # that nothing in hardware has changed and the script is working properly. + INITSTRING="" + for ((i=1; i<=${RETVAL[0]}; i++)); do + INITSTRING=${INITSTRING}"${RETVAL[i]} " + i=`expr $i + 1` + INITSTRING=${INITSTRING}"${RETVAL[$i]} " + done +} + +###################################### END FUNCTION DECLARATIONS ###################################### + +case $1 in + start) + echo -n "Verify the apropriate mtrr setting" + # watch the sequence of function calls! + checkmtrr || exit 1 + fillarray + checkconfigfile || exit 1 + . ${CONFIGFILE} + # This is needed because SUSE cannot handle arrays in the /etc/sysconfig - files. The format of the + # variable FRAMEBUFFERSIZE must be adapted to what it should be! + eval FRAMEBUFFERSIZE=(${FRAMEBUFFERSIZE}) + + # + # Now we have to look into $MTRR. There are settings for the graphics card we find by looking at the address values. + # Those addresses that are identical to the ones from the graphics card are the ones we need. + # However, one cannot rely on the return value for memory of lspci. Therefore we introduced an environment variable Array + # defined in /etc/sysconfig/framebuffer that needs to be set by the user. It is called FRAMEBUFFERSIZE[i] and can have values + # from 16 to 16384 [MB] for each index. + # + # If we find an entry in /proc/mtrr that corresponds to an entry we got out of lspci, we check whether the settings in + # in out of lspci differ from those in /proc/mtrr. If that would be the case, we modify the mtrr settings in accordance + # with what is defined in the setting for FRAMEBUFFERSIZE[i] + # + + # initializations: + MEMERR="FALSE" + MEMVALID="FALSE" + + for (( j=1 ; $j <= ${RETVAL[0]} ; j=`expr $j + 2` )) ; do + RESULT=(`$CAT $MTRR | ${AWK} -v cmp="${RETVAL[$j]}" '{if (cmp==$2){gsub(/[^0-9 ]/, "", $0); printf("%d %d", $1, $4)}}'`) + # if RESULT is empty, put defaults into it. + if [ "" = "${RESULT[0]}" ]; then + RESULT[0]=-1 + RESULT[1]=-1 + fi + if [ "${RESULT[1]}" != "${RETVAL[`expr $j + 1`]}" -a "${RESULT[0]}" != "-1" ]; then + if [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "16" ]; then + MEMSIZE=1000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "32" ]; then + MEMSIZE=2000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "64" ]; then + MEMSIZE=4000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "128" ]; then + MEMSIZE=8000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "256" ]; then + MEMSIZE=10000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "512" ]; then + MEMSIZE=20000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "1024" ]; then + MEMSIZE=40000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "2048" ]; then + MEMSIZE=80000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "4096" ]; then + MEMSIZE=100000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "8192" ]; then + MEMSIZE=200000000 + elif [ "${FRAMEBUFFERSIZE[${RESULT[0]}]]}" = "16384" ]; then + MEMSIZE=400000000 + else + MEMSIZE=INVALID + MEMERR=TRUE + fi + else + MEMSIZE="" + fi + + if [ "${MEMSIZE}" != "INVALID" -a "${MEMSIZE}" != "" ]; then + MEMVALID=TRUE + echo "disable=${RESULT[0]}" > ${MTRR} + echo "${RETVAL[$j]} size=0x${MEMSIZE} type=write-combining" > ${MTRR} + echo "$rc_done" + fi + done + + if [ "${MEMERR}" = "TRUE" ]; then + echo -n " ${attn}found one wrong memsize at last!${norm}" + echo $rc_failed + elif [ "${MEMVALID}" = "FALSE" ]; then + echo -n " ${attn}nothing to do, sizes are equal!${norm}" + echo "$rc_done" + else + echo "$rc_done" + fi + ;; + stop) + echo -n "Shut down mtrr setting (do nothing)" + echo "$rc_done" + ;; + init) + fillarray + makeconfigfile + ;; + *) + echo -n "Usage: $0 {start|stop}" + echo "$rc_done" + ;; +esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/framebuffer-2005/sysconfig.framebuffer new/framebuffer-2006/sysconfig.framebuffer --- old/framebuffer-2005/sysconfig.framebuffer 2005-09-27 21:56:50.000000000 +0200 +++ new/framebuffer-2006/sysconfig.framebuffer 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -## Path: Hardware/Framebuffer/Memory -## Description: Framebuffer-sizes -## Type: string() -## - -# The size of the framebuffer memory in Megabyte we want to allocate in /proc/mtrr -# This can vary between 16 and 2048 (MB) in factors of 2 (16,32,64 ... 2048) -# -# FRAMEBUFFERSIZE="128" -FRAMEBUFFERSIZE="" \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fox16
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package fox16 checked in at Thu Dec 7 20:11:44 CET 2006. -------- --- fox16/fox16.changes 2006-10-13 04:19:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/fox16/fox16.changes 2006-12-05 18:02:59.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 1 02:13:52 CET 2006 - lrupp(a)suse.de + +- update to 1.6.20 + + Rolled back explicit template instantiation stuff: + not supported everywhere. + + Fix bug in FXMutex::locked() implementation. + + Suppress 4244 warning (possible loss of data) on VC++ compiler. + + Bug fix in FXApp drag and drop. + + Wrong error message in argument check in FXTable API. + + Fixed minor issues in FXPicker: now issues message on mouse + button release. + + Fixed problems in FXFile, FXSocket, FXPipe occurring on + 64-bit Windows. + +------------------------------------------------------------------- Old: ---- fox-1.6.16.tar.bz2 fox-1.6.16_AM_CFLAGS.patch fox-1.6.16_configure_x11_extensions_header.patch fox-1.6.16_initialise_local_variable.patch New: ---- fox-1.6.20.tar.bz2 fox-1.6.20_AM_CFLAGS.patch fox-1.6.20_configure_x11_extensions_header.patch fox-1.6.20_initialise_local_variable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fox16.spec ++++++ --- /var/tmp/diff_new_pack.4k0SoX/_old 2006-12-07 20:11:21.000000000 +0100 +++ /var/tmp/diff_new_pack.4k0SoX/_new 2006-12-07 20:11:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package fox16 (Version 1.6.16) +# spec file for package fox16 (Version 1.6.20) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,19 +12,23 @@ Name: fox16 URL: http://www.fox-toolkit.org/ -Version: 1.6.16 +Version: 1.6.20 Release: 1 Summary: Shared Libraries for the FOX Toolkit Group: Development/Languages/C and C++ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Source: fox-%{version}.tar.bz2 Obsoletes: fox <= %{version} Provides: fox -Patch: fox-1.6.16_configure_x11_extensions_header.patch -Patch1: fox-1.6.16_AM_CFLAGS.patch -Patch2: fox-1.6.16_initialise_local_variable.patch +Patch: fox-1.6.20_configure_x11_extensions_header.patch +Patch1: fox-1.6.20_AM_CFLAGS.patch +Patch2: fox-1.6.20_initialise_local_variable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %suse_version >= 1000 BuildRequires: cups-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel pkgconfig xorg-x11-Mesa-devel xorg-x11-devel zlib-devel +%else +BuildRequires: XFree86-Mesa XFree86-Mesa-devel XFree86-devel XFree86-libs cups-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel pkgconfig zlib-devel +%endif Autoreqprov: on %description @@ -195,6 +199,18 @@ %{_mandir}/man1/shutterbug* %changelog -n fox16 +* Fri Dec 01 2006 - lrupp(a)suse.de +- update to 1.6.20 + + Rolled back explicit template instantiation stuff: + not supported everywhere. + + Fix bug in FXMutex::locked() implementation. + + Suppress 4244 warning (possible loss of data) on VC++ compiler. + + Bug fix in FXApp drag and drop. + + Wrong error message in argument check in FXTable API. + + Fixed minor issues in FXPicker: now issues message on mouse + button release. + + Fixed problems in FXFile, FXSocket, FXPipe occurring on + 64-bit Windows. * Fri Oct 13 2006 - lrupp(a)suse.de - update to 1.6.16 + Fixed issue with FXMDIChild and FXTopWindow close() routine; ++++++ fox-1.6.16.tar.bz2 -> fox-1.6.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/Makefile.in new/fox-1.6.20/Makefile.in --- old/fox-1.6.16/Makefile.in 2006-09-30 20:57:42.000000000 +0200 +++ new/fox-1.6.20/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -80,11 +80,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/aclocal.m4 new/fox-1.6.20/aclocal.m4 --- old/fox-1.6.16/aclocal.m4 2006-09-29 04:26:19.000000000 +0200 +++ new/fox-1.6.20/aclocal.m4 2006-11-17 17:03:07.000000000 +0100 @@ -10,825 +10,6 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. -# lib-prefix.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-link.m4 serial 6 (gettext-0.14.3) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.50) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; -*) - acl_cv_prog_gnu_ld=no ;; -esac]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) - -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/adie/Makefile.in new/fox-1.6.20/adie/Makefile.in --- old/fox-1.6.16/adie/Makefile.in 2006-09-30 20:57:50.000000000 +0200 +++ new/fox-1.6.20/adie/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/calculator/Makefile.in new/fox-1.6.20/calculator/Makefile.in --- old/fox-1.6.16/calculator/Makefile.in 2006-09-30 20:57:51.000000000 +0200 +++ new/fox-1.6.20/calculator/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/chart/Makefile.in new/fox-1.6.20/chart/Makefile.in --- old/fox-1.6.16/chart/Makefile.in 2006-09-30 20:57:47.000000000 +0200 +++ new/fox-1.6.20/chart/Makefile.in 2006-11-17 17:08:02.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/configure new/fox-1.6.20/configure --- old/fox-1.6.16/configure 2006-09-29 04:26:24.000000000 +0200 +++ new/fox-1.6.20/configure 2006-11-17 17:03:21.000000000 +0100 @@ -1520,7 +1520,7 @@ FOX_MINOR_VERSION=6 -FOX_PATCH_LEVEL=16 +FOX_PATCH_LEVEL=20 FOX_INTERFACE_VERSION=0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/configure.in new/fox-1.6.20/configure.in --- old/fox-1.6.16/configure.in 2006-09-29 04:26:16.000000000 +0200 +++ new/fox-1.6.20/configure.in 2006-11-17 17:03:07.000000000 +0100 @@ -8,7 +8,7 @@ FOX_MINOR_VERSION=6 dnl Increment after every source code change -FOX_PATCH_LEVEL=16 +FOX_PATCH_LEVEL=20 dnl Binaries compiled with this patchlevel of FOX will need at least dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/Makefile.in new/fox-1.6.20/doc/Makefile.in --- old/fox-1.6.16/doc/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/Makefile.in 2006-11-17 17:08:02.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/art/Makefile.in new/fox-1.6.20/doc/art/Makefile.in --- old/fox-1.6.16/doc/art/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/art/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/doc/screenshots/Makefile.in new/fox-1.6.20/doc/screenshots/Makefile.in --- old/fox-1.6.16/doc/screenshots/Makefile.in 2006-09-30 20:57:48.000000000 +0200 +++ new/fox-1.6.20/doc/screenshots/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXGLObject.h new/fox-1.6.20/include/FXGLObject.h --- old/fox-1.6.16/include/FXGLObject.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXGLObject.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXGLObject.h,v 1.28.2.2 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXGLObject.h,v 1.28.2.3 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXGLOBJECT_H #define FXGLOBJECT_H @@ -79,10 +79,6 @@ }; -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXGLObject>; - - /// List of GL objects typedef FXObjectListOf<FXGLObject> FXGLObjectList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXHeader.h new/fox-1.6.20/include/FXHeader.h --- old/fox-1.6.16/include/FXHeader.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXHeader.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXHeader.h,v 1.70.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXHeader.h,v 1.70.2.2 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXHEADER_H #define FXHEADER_H @@ -163,10 +163,6 @@ }; -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXHeaderItem>; - - /// List of FXHeaderItem's typedef FXObjectListOf<FXHeaderItem> FXHeaderItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXIconList.h new/fox-1.6.20/include/FXIconList.h --- old/fox-1.6.16/include/FXIconList.h 2006-08-04 02:15:37.000000000 +0200 +++ new/fox-1.6.20/include/FXIconList.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXIconList.h,v 1.95.2.3 2006/08/02 01:31:07 fox Exp $ * +* $Id: FXIconList.h,v 1.95.2.4 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXICONLIST_H #define FXICONLIST_H @@ -168,10 +168,6 @@ typedef FXint (*FXIconListSortFunc)(const FXIconItem*,const FXIconItem*); -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXIconItem>; - - /// List of FXIconItem's typedef FXObjectListOf<FXIconItem> FXIconItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/FXList.h new/fox-1.6.20/include/FXList.h --- old/fox-1.6.16/include/FXList.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/FXList.h 2006-11-17 17:03:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXList.h,v 1.88.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: FXList.h,v 1.88.2.2 2006/11/17 16:02:31 fox Exp $ * ********************************************************************************/ #ifndef FXLIST_H #define FXLIST_H @@ -149,10 +149,6 @@ typedef FXint (*FXListSortFunc)(const FXListItem*,const FXListItem*); -/// Explicit template specialization -FXTEMPLATE_EXTERN template class FXAPI FXObjectListOf<FXListItem>; - - /// List of FXListItem's typedef FXObjectListOf<FXListItem> FXListItemList; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/Makefile.in new/fox-1.6.20/include/Makefile.in --- old/fox-1.6.16/include/Makefile.in 2006-09-30 20:57:43.000000000 +0200 +++ new/fox-1.6.20/include/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/fxdefs.h new/fox-1.6.20/include/fxdefs.h --- old/fox-1.6.16/include/fxdefs.h 2006-07-28 02:56:30.000000000 +0200 +++ new/fox-1.6.20/include/fxdefs.h 2006-11-10 02:00:26.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: fxdefs.h,v 1.178.2.1 2006/07/28 00:56:30 fox Exp $ * +* $Id: fxdefs.h,v 1.178.2.2 2006/11/09 23:21:43 fox Exp $ * ********************************************************************************/ #ifndef FXDEFS_H #define FXDEFS_H @@ -131,10 +131,11 @@ #endif -// Templates with DLL linkage +// Disable some warnings in VC++ #ifdef _MSC_VER #pragma warning(disable: 4251) #pragma warning(disable: 4231) +#pragma warning(disable: 4244) #endif // Checking printf and scanf format strings diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/include/fxver.h new/fox-1.6.20/include/fxver.h --- old/fox-1.6.16/include/fxver.h 2006-09-29 04:27:13.000000000 +0200 +++ new/fox-1.6.20/include/fxver.h 2006-11-17 17:03:59.000000000 +0100 @@ -5,7 +5,7 @@ // FOX version #define FOX_MAJOR 1 #define FOX_MINOR 6 -#define FOX_LEVEL 16 +#define FOX_LEVEL 20 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/pathfinder/Makefile.in new/fox-1.6.20/pathfinder/Makefile.in --- old/fox-1.6.16/pathfinder/Makefile.in 2006-09-30 20:57:51.000000000 +0200 +++ new/fox-1.6.20/pathfinder/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/shutterbug/Makefile.in new/fox-1.6.20/shutterbug/Makefile.in --- old/fox-1.6.16/shutterbug/Makefile.in 2006-09-30 20:57:50.000000000 +0200 +++ new/fox-1.6.20/shutterbug/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXApp.cpp new/fox-1.6.20/src/FXApp.cpp --- old/fox-1.6.16/src/FXApp.cpp 2006-09-30 20:56:10.000000000 +0200 +++ new/fox-1.6.20/src/FXApp.cpp 2006-10-02 14:36:47.000000000 +0200 @@ -21,7 +21,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXApp.cpp,v 1.617.2.3 2006/09/27 13:13:33 fox Exp $ * +* $Id: FXApp.cpp,v 1.617.2.4 2006/10/02 12:36:47 fox Exp $ * ********************************************************************************/ #ifdef WIN32 #if _WIN32_WINNT < 0x0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXFile.cpp new/fox-1.6.20/src/FXFile.cpp --- old/fox-1.6.16/src/FXFile.cpp 2006-08-04 02:15:41.000000000 +0200 +++ new/fox-1.6.20/src/FXFile.cpp 2006-11-07 16:59:08.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXFile.cpp,v 1.249.2.1 2006/08/01 18:04:31 fox Exp $ * +* $Id: FXFile.cpp,v 1.249.2.2 2006/11/07 15:58:52 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -207,7 +207,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -224,7 +227,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXPicker.cpp new/fox-1.6.20/src/FXPicker.cpp --- old/fox-1.6.16/src/FXPicker.cpp 2006-01-22 18:58:37.000000000 +0100 +++ new/fox-1.6.20/src/FXPicker.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXPicker.cpp,v 1.21 2006/01/22 17:58:37 fox Exp $ * +* $Id: FXPicker.cpp,v 1.21.2.1 2006/10/19 19:15:19 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -107,18 +107,23 @@ handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr); flags&=~FLAG_TIP; if(isEnabled()){ - if(state!=STATE_DOWN){ + if(state==STATE_UP){ grab(); setState(STATE_DOWN); flags&=~FLAG_UPDATE; } else{ + setState(STATE_UP); + } +/* + else{ ungrab(); flags|=FLAG_UPDATE; setState(STATE_UP); FXPoint point(event->root_x,event->root_y); if(target){ target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)&point); } } +*/ return 1; } return 0; @@ -126,7 +131,17 @@ // Released mouse button -long FXPicker::onLeftBtnRelease(FXObject*,FXSelector,void*){ +long FXPicker::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){ + FXEvent* event=(FXEvent*)ptr; + if(isEnabled()){ + if(state==STATE_UP){ + ungrab(); + flags|=FLAG_UPDATE; + FXPoint point(event->root_x,event->root_y); + if(target){ target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)&point); } + } + return 1; + } return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXPipe.cpp new/fox-1.6.20/src/FXPipe.cpp --- old/fox-1.6.16/src/FXPipe.cpp 2006-01-22 18:58:37.000000000 +0100 +++ new/fox-1.6.20/src/FXPipe.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXPipe.cpp,v 1.7 2006/01/22 17:58:37 fox Exp $ * +* $Id: FXPipe.cpp,v 1.7.2.1 2006/11/07 15:58:53 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -73,7 +73,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -90,7 +93,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXSocket.cpp new/fox-1.6.20/src/FXSocket.cpp --- old/fox-1.6.16/src/FXSocket.cpp 2006-01-22 18:58:41.000000000 +0100 +++ new/fox-1.6.20/src/FXSocket.cpp 2006-11-07 16:59:09.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXSocket.cpp,v 1.6 2006/01/22 17:58:41 fox Exp $ * +* $Id: FXSocket.cpp,v 1.6.2.1 2006/11/07 15:58:53 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -73,7 +73,10 @@ FXival nread=-1; if(isOpen()){ #ifdef WIN32 - if(0==::ReadFile(device,data,count,(DWORD*)&nread,NULL)) nread=-1; + DWORD nr; + if(::ReadFile(device,data,(DWORD)count,&nr,NULL)!=0){ + nread=(FXival)nr; + } #else do{ nread=::read(device,data,count); @@ -90,7 +93,10 @@ FXival nwritten=-1; if(isOpen()){ #ifdef WIN32 - if(0==::WriteFile(device,data,count,(DWORD*)&nwritten,NULL)) nwritten=-1; + DWORD nw; + if(::WriteFile(device,data,(DWORD)count,&nw,NULL)!=0){ + nwritten=(FXival)nw; + } #else do{ nwritten=::write(device,data,count); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXTable.cpp new/fox-1.6.20/src/FXTable.cpp --- old/fox-1.6.16/src/FXTable.cpp 2006-08-04 02:15:46.000000000 +0200 +++ new/fox-1.6.20/src/FXTable.cpp 2006-11-07 16:59:10.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXTable.cpp,v 1.245.2.4 2006/08/02 01:31:10 fox Exp $ * +* $Id: FXTable.cpp,v 1.245.2.5 2006/10/16 21:10:48 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -3821,7 +3821,7 @@ FXTableRange tablerange; // Must be in range - if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::removeItem: index out of range.\n",getClassName()); } + if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::extractItem: index out of range.\n",getClassName()); } // Extent of cell sr=startRow(row,col); er=endRow(row,col); @@ -3901,7 +3901,7 @@ register FXint r,c; // Verify range - if(startrow<0 || startcol<0 || nrows<=endrow || ncols<=endcol){ fxerror("%s::clearRange: index out of range.\n",getClassName()); } + if(startrow<0 || startcol<0 || nrows<=endrow || ncols<=endcol){ fxerror("%s::removeRange: index out of range.\n",getClassName()); } // Free all cells for(r=startrow; r<=endrow; r++){ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/FXThread.cpp new/fox-1.6.20/src/FXThread.cpp --- old/fox-1.6.16/src/FXThread.cpp 2006-07-28 07:30:49.000000000 +0200 +++ new/fox-1.6.20/src/FXThread.cpp 2006-11-09 01:30:58.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: FXThread.cpp,v 1.53.2.7 2006/07/28 05:30:49 fox Exp $ * +* $Id: FXThread.cpp,v 1.53.2.8 2006/11/08 22:58:28 fox Exp $ * ********************************************************************************/ #ifdef WIN32 #if _WIN32_WINNT < 0x0400 @@ -125,9 +125,11 @@ // Test if locked FXbool FXMutex::locked(){ - if(pthread_mutex_trylock((pthread_mutex_t*)data)==EBUSY) return TRUE; - pthread_mutex_unlock((pthread_mutex_t*)data); - return FALSE; + if(pthread_mutex_trylock((pthread_mutex_t*)data)==0){ + pthread_mutex_unlock((pthread_mutex_t*)data); + return false; + } + return true; } @@ -553,10 +555,12 @@ // Test if locked FXbool FXMutex::locked(){ #if(_WIN32_WINNT >= 0x0400) - if(TryEnterCriticalSection((CRITICAL_SECTION*)data)==0) return FALSE; - LeaveCriticalSection((CRITICAL_SECTION*)data); + if(TryEnterCriticalSection((CRITICAL_SECTION*)data)!=0){ + LeaveCriticalSection((CRITICAL_SECTION*)data); + return false; + } #endif - return TRUE; + return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/Makefile.in new/fox-1.6.20/src/Makefile.in --- old/fox-1.6.16/src/Makefile.in 2006-09-30 20:57:46.000000000 +0200 +++ new/fox-1.6.20/src/Makefile.in 2006-11-17 17:08:01.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/version.rc new/fox-1.6.20/src/version.rc --- old/fox-1.6.16/src/version.rc 2006-09-30 20:57:45.000000000 +0200 +++ new/fox-1.6.20/src/version.rc 2006-11-17 17:08:01.000000000 +0100 @@ -1,5 +1,5 @@ 1 VERSIONINFO -FILEVERSION 1,6,16,0 +FILEVERSION 1,6,20,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -15,7 +15,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "FOX GUI Library\0" -VALUE "FileVersion", "1,6,16.0\0" +VALUE "FileVersion", "1,6,20.0\0" VALUE "LegalCopyright", "GNU Library General Public License\0" END END diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/src/vsscanf.cpp new/fox-1.6.20/src/vsscanf.cpp --- old/fox-1.6.16/src/vsscanf.cpp 2006-01-22 18:58:58.000000000 +0100 +++ new/fox-1.6.20/src/vsscanf.cpp 2006-11-09 01:58:13.000000000 +0100 @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * ********************************************************************************* -* $Id: vsscanf.cpp,v 1.20 2006/01/22 17:58:58 fox Exp $ * +* $Id: vsscanf.cpp,v 1.20.2.1 2006/11/09 00:58:13 fox Exp $ * ********************************************************************************/ #include "xincs.h" #include "fxver.h" @@ -46,7 +46,9 @@ #ifndef HAVE_VSSCANF // API +#if !defined(_MSC_VER) || (_MSC_VER < 1400) extern "C" int vfscanf(FILE *stream, const char *format, va_list arg_ptr); +#endif // API @@ -388,10 +390,12 @@ // API +#if !defined(_MSC_VER) || (_MSC_VER < 1400) int vfscanf(FILE *stream,const char *format,va_list arg_ptr){ arg_scanf farg={(void*)stream,(int(*)(void*))fgetc,(int(*)(int,void*))ungetc}; return __v_scanf(&farg,format,arg_ptr); } +#endif // API diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/tests/Makefile.in new/fox-1.6.20/tests/Makefile.in --- old/fox-1.6.16/tests/Makefile.in 2006-09-30 20:57:49.000000000 +0200 +++ new/fox-1.6.20/tests/Makefile.in 2006-11-17 17:08:03.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/utils/Makefile.in new/fox-1.6.20/utils/Makefile.in --- old/fox-1.6.16/utils/Makefile.in 2006-09-30 20:57:43.000000000 +0200 +++ new/fox-1.6.20/utils/Makefile.in 2006-11-17 17:08:00.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.16/windows/Makefile.in new/fox-1.6.20/windows/Makefile.in --- old/fox-1.6.16/windows/Makefile.in 2006-09-30 20:57:52.000000000 +0200 +++ new/fox-1.6.20/windows/Makefile.in 2006-11-17 17:08:04.000000000 +0100 @@ -78,11 +78,8 @@ GCJFLAGS = @GCJFLAGS@ GL_LIBS = @GL_LIBS@ GL_TESTS = @GL_TESTS@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIB = @LTLIB@ LT_AGE = @LT_AGE@ LT_CURRENT = @LT_CURRENT@ LT_RELEASE = @LT_RELEASE@ ++++++ fox-1.6.16_AM_CFLAGS.patch -> fox-1.6.20_AM_CFLAGS.patch ++++++ ++++++ fox-1.6.16_configure_x11_extensions_header.patch -> fox-1.6.20_configure_x11_extensions_header.patch ++++++ ++++++ fox-1.6.16_initialise_local_variable.patch -> fox-1.6.20_initialise_local_variable.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flphoto
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package flphoto checked in at Thu Dec 7 20:11:14 CET 2006. -------- --- flphoto/flphoto.changes 2006-10-22 10:13:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/flphoto/flphoto.changes 2006-12-06 11:14:46.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Dec 6 11:13:44 CET 2006 - meissner(a)suse.de + +- upgraded to 1.3.1. + - new fldcraw + - calendar printing enhanced + - various bugfixes +- maximum() -> maxinum() typo in older FLTKs. + +------------------------------------------------------------------- Old: ---- flphoto-1.3-AVI.patch flphoto-1.3-fix.patch flphoto-1.3.tar.bz2 New: ---- flphoto-1.3.1-maxinum.patch flphoto-1.3.1-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flphoto.spec ++++++ --- /var/tmp/diff_new_pack.N3q09j/_old 2006-12-07 20:06:44.000000000 +0100 +++ /var/tmp/diff_new_pack.N3q09j/_new 2006-12-07 20:06:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package flphoto (Version 1.3) +# spec file for package flphoto (Version 1.3.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,15 @@ Name: flphoto BuildRequires: cups-devel fltk-devel gcc-c++ libgphoto2-devel libjpeg-devel libpng-devel openssl-devel xorg-x11-devel -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Graphics/Viewers Summary: An FLTK-Based Basic Image Management and Display Program -Version: 1.3 -Release: 33 -Source: flphoto-%{version}.tar.bz2 +Version: 1.3.1 +Release: 1 +Source: flphoto-%{version}-source.tar.bz2 Patch: flphoto-1.1rc3-locale.patch -Patch1: flphoto-1.3-AVI.patch +Patch1: flphoto-1.3.1-maxinum.patch Patch2: flphoto-configure.patch -Patch3: flphoto-1.3-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.easysw.com/~mike/flphoto/ %define prefix /usr @@ -44,15 +43,14 @@ %prep %setup -q %patch0 -p1 -%patch1 +%patch1 -p1 %patch2 -%patch3 -p1 %build %{?suse_update_config:%{suse_update_config}} autoconf -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ +CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ +CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" \ ./configure --prefix=%{prefix} --datadir=%{prefix}/share --with-docdir=%{_docdir}/%{name} make @@ -72,9 +70,16 @@ %defattr(-,root,root) %doc COPYING README doc/*.html doc/*.png doc/*.jpg /usr/bin/flphoto +/usr/bin/fldcraw %{_mandir}/man*/* %changelog -n flphoto +* Wed Dec 06 2006 - meissner(a)suse.de +- upgraded to 1.3.1. + - new fldcraw + - calendar printing enhanced + - various bugfixes +- maximum() -> maxinum() typo in older FLTKs. * Sun Oct 22 2006 - meissner(a)suse.de - added buildrequires libgphoto2-devel. * Mon Jun 19 2006 - schwab(a)suse.de ++++++ flphoto-1.3.1-maxinum.patch ++++++ --- flphoto-1.3.1/image.cxx.xx 2006-12-06 10:58:51.000000000 +0100 +++ flphoto-1.3.1/image.cxx 2006-12-06 10:59:13.000000000 +0100 @@ -1424,15 +1424,15 @@ // Display the crop box... left = (int)(crop_image_->w() * crop_left_value_->value() / - crop_left_value_->maximum()); + crop_left_value_->maxinum()); right = crop_image_->w() - (int)(crop_image_->w() * crop_right_value_->value() / - crop_right_value_->maximum()); + crop_right_value_->maxinum()); top = (int)(crop_image_->h() * crop_top_value_->value() / - crop_top_value_->maximum()); + crop_top_value_->maxinum()); bottom = crop_image_->h() - (int)(crop_image_->h() * crop_bottom_value_->value() / - crop_bottom_value_->maximum()); + crop_bottom_value_->maxinum()); if (left > right) { @@ -1450,9 +1450,9 @@ snprintf(crop_dimensions_label_, sizeof(crop_dimensions_label_), _("%d x %d pixels"), - (int)(crop_left_value_->maximum() - crop_left_value_->value() - + (int)(crop_left_value_->maxinum() - crop_left_value_->value() - crop_right_value_->value()), - (int)(crop_bottom_value_->maximum() - crop_bottom_value_->value() - + (int)(crop_bottom_value_->maxinum() - crop_bottom_value_->value() - crop_top_value_->value())); crop_dimensions_box_->label(crop_dimensions_label_); crop_dimensions_box_->redraw(); ++++++ flphoto-configure.patch ++++++ --- /var/tmp/diff_new_pack.N3q09j/_old 2006-12-07 20:06:45.000000000 +0100 +++ /var/tmp/diff_new_pack.N3q09j/_new 2006-12-07 20:06:45.000000000 +0100 @@ -1,14 +1,3 @@ ---- configure.in -+++ configure.in -@@ -196,7 +196,7 @@ - fi - - CXX="$CC" -- OPTIM="-Wall -Wno-return-type $OPTIM" -+ OPTIM="-Wall $OPTIM" - - # See if GCC supports -fno-rtti... - AC_MSG_CHECKING(if GCC supports -fno-rtti) --- Makefile.in +++ Makefile.in @@ -117,7 +117,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit firmwarekit
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package firmwarekit checked in at Thu Dec 7 20:06:39 CET 2006. -------- --- arch/i386/firmwarekit/firmwarekit.changes 2006-11-24 19:22:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/firmwarekit/firmwarekit.changes 2006-12-06 14:41:12.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 6 14:41:08 CET 2006 - dmueller(a)suse.de + +- don't build as root + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firmwarekit.spec ++++++ --- /var/tmp/diff_new_pack.wrS1Ew/_old 2006-12-07 20:06:10.000000000 +0100 +++ /var/tmp/diff_new_pack.wrS1Ew/_new 2006-12-07 20:06:10.000000000 +0100 @@ -8,13 +8,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: firmwarekit BuildRequires: bash coreutils dhclient dhcp-client findutils gawk gdb glib2 glib2-devel glibc grep iproute2 libacl libattr module-init-tools ncurses newt newt-devel pciutils pcre perl pkgconfig pmtools sed sharutils slang slang-devel sysvinit termcap util-linux wget xorg-x11-util-devel URL: http://www.linuxfirmwarekit.org Summary: BIOS checker that validates ACPI and other parts for x86 and x86_64 machines Version: r1.102 -Release: 7 +Release: 9 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Boot Autoreqprov: on @@ -98,6 +99,8 @@ %{_mandir}/man1/biostest.1.gz %changelog -n firmwarekit +* Wed Dec 06 2006 - dmueller(a)suse.de +- don't build as root * Fri Nov 24 2006 - trenn(a)suse.de - removed quotation marks to properly pass params from /usr/bin/biostest.sh wrapper to /usr/share/firmwarekit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit findutils
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package findutils checked in at Thu Dec 7 20:06:04 CET 2006. -------- --- findutils/findutils.changes 2006-11-20 13:26:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/findutils/findutils.changes 2006-12-04 13:26:04.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 4 13:22:38 CET 2006 - schwab(a)suse.de + +- Update to finutils 4.2.29. + ** Documentation Fixes + The global effect of options (other than -daystart and -follow) is now + explained more clearly in the manual page. Savannah bug #15360. + ** Bug Fixes + #17782: find -execdir now correctly puts the prefix "./" before the + expansion of "{}" rather than at the start of the argument it appears + in. Please note that if you use the -exec or -execdir actions with a + shell, then you may be vulnerable to shell code injection attacks, so + don't do that. It's not a security defect in find - you should not be + passing untrusted data (such as file names chosen by other people) to + the shell. + #17477: find -printf '%' (that is, where the format has a trailing %) + now generates an error message. + +------------------------------------------------------------------- Old: ---- findutils-4.2.28.diff findutils-4.2.28.tar.gz New: ---- findutils-4.2.29.diff findutils-4.2.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ findutils.spec ++++++ --- /var/tmp/diff_new_pack.jnDZqr/_old 2006-12-07 20:03:26.000000000 +0100 +++ /var/tmp/diff_new_pack.jnDZqr/_new 2006-12-07 20:03:26.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package findutils (Version 4.2.28) +# spec file for package findutils (Version 4.2.29) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,8 +18,8 @@ Obsoletes: find Autoreqprov: on PreReq: %{install_info_prereq} -Version: 4.2.28 -Release: 22 +Version: 4.2.29 +Release: 1 Summary: GNU find--Finding Files Source: findutils-%{version}.tar.gz Source1: sysconfig.locate @@ -133,6 +133,21 @@ /var/adm/fillup-templates/* %changelog -n findutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to finutils 4.2.29. + ** Documentation Fixes + The global effect of options (other than -daystart and -follow) is now + explained more clearly in the manual page. Savannah bug #15360. + ** Bug Fixes + [#17782]: find -execdir now correctly puts the prefix "./" before the + expansion of "{}" rather than at the start of the argument it appears + in. Please note that if you use the -exec or -execdir actions with a + shell, then you may be vulnerable to shell code injection attacks, so + don't do that. It's not a security defect in find - you should not be + passing untrusted data (such as file names chosen by other people) to + the shell. + [#17477]: find -printf '%%' (that is, where the format has a trailing %%) + now generates an error message. * Mon Nov 20 2006 - schwab(a)suse.de - cron.daily.clean_core: robustify even more. * Mon Oct 16 2006 - schwab(a)suse.de ++++++ findutils-4.2.28.diff -> findutils-4.2.29.diff ++++++ ++++++ findutils-4.2.28.tar.gz -> findutils-4.2.29.tar.gz ++++++ ++++ 11656 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-tv
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-tv checked in at Thu Dec 7 20:02:33 CET 2006. -------- --- yast2-tv/yast2-tv.changes 2006-11-10 14:58:09.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-tv/yast2-tv.changes 2006-12-04 15:58:19.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 30 14:51:03 CET 2006 - lslezak(a)suse.cz + +- update of testsuite (build fix) +- use Progress::set() +- disable TV channel setup for DVB cards (not implemented) +- 2.15.1 + +------------------------------------------------------------------- +Wed Nov 29 15:22:21 CET 2006 - lslezak(a)suse.cz + +- search for DVB drivers also in analog driver directory (#140468) +- the main dialog: display an icon, use unified label (#211566) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-tv-2.14.0.tar.bz2 New: ---- yast2-tv-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tv.spec ++++++ --- /var/tmp/diff_new_pack.j3fj0x/_old 2006-12-07 20:01:49.000000000 +0100 +++ /var/tmp/diff_new_pack.j3fj0x/_new 2006-12-07 20:01:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tv (Version 2.14.0) +# spec file for package yast2-tv (Version 2.15.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-tv -Version: 2.14.0 -Release: 10 +Version: 2.15.1 +Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tv-2.14.0.tar.bz2 +Source0: yast2-tv-2.15.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite %ifnarch s390 s390x @@ -42,7 +42,7 @@ Jan Holesovsky <kendy(a)suse.cz> %prep -%setup -n yast2-tv-2.14.0 +%setup -n yast2-tv-2.15.1 %build %{prefix}/bin/y2tool y2autoconf @@ -77,6 +77,15 @@ %doc %{prefix}/share/doc/packages/yast2-tv %changelog -n yast2-tv +* Thu Nov 30 2006 - lslezak(a)suse.cz +- update of testsuite (build fix) +- use Progress::set() +- disable TV channel setup for DVB cards (not implemented) +- 2.15.1 +* Wed Nov 29 2006 - lslezak(a)suse.cz +- search for DVB drivers also in analog driver directory (#140468) +- the main dialog: display an icon, use unified label (#211566) +- 2.15.0 * Fri Nov 10 2006 - lslezak(a)suse.cz - fixed path to 'scantv' utility (/usr/X11R6/bin -> /usr/bin) (#214134) ++++++ yast2-tv-2.14.0.tar.bz2 -> yast2-tv-2.15.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/VERSION new/yast2-tv-2.15.1/VERSION --- old/yast2-tv-2.14.0/VERSION 2006-11-10 14:51:51.000000000 +0100 +++ new/yast2-tv-2.15.1/VERSION 2006-12-04 15:48:48.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/configure new/yast2-tv-2.15.1/configure --- old/yast2-tv-2.14.0/configure 2006-11-10 14:56:21.000000000 +0100 +++ new/yast2-tv-2.15.1/configure 2006-12-04 15:49:37.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-tv 2.14.0. +# Generated by GNU Autoconf 2.60 for yast2-tv 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-tv' PACKAGE_TARNAME='yast2-tv' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-tv 2.14.0' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-tv 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1180,7 +1180,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-tv 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-tv 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1251,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-tv 2.14.0:";; + short | recursive ) echo "Configuration of yast2-tv 2.15.1:";; esac cat <<\_ACEOF @@ -1329,7 +1329,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-tv configure 2.14.0 +yast2-tv configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1343,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-tv $as_me 2.14.0, which was +It was created by yast2-tv $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2144,7 @@ # Define the identity of the package. PACKAGE='yast2-tv' - VERSION='2.14.0' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2371,7 @@ -VERSION="2.14.0" +VERSION="2.15.1" RPMNAME="yast2-tv" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3227,7 +3227,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-tv $as_me 2.14.0, which was +This file was extended by yast2-tv $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3270,7 +3270,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-tv config.status 2.14.0 +yast2-tv config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/configure.in new/yast2-tv-2.15.1/configure.in --- old/yast2-tv-2.14.0/configure.in 2006-11-10 14:56:16.000000000 +0100 +++ new/yast2-tv-2.15.1/configure.in 2006-12-04 15:49:32.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tv, 2.14.0, http://bugs.opensuse.org/, yast2-tv) +AC_INIT(yast2-tv, 2.15.1, http://bugs.opensuse.org/, yast2-tv) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.15.1" RPMNAME="yast2-tv" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/src/Tv.ycp new/yast2-tv-2.15.1/src/Tv.ycp --- old/yast2-tv-2.14.0/src/Tv.ycp 2006-10-12 10:36:06.000000000 +0200 +++ new/yast2-tv-2.15.1/src/Tv.ycp 2006-11-29 15:27:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of tv, input and output functions. * Authors: Jan Holesovsky <kendy(a)suse.cz> * - * $Id: Tv.ycp 33339 2006-10-12 08:36:03Z lslezak $ + * $Id: Tv.ycp 34643 2006-11-29 14:27:10Z lslezak $ * * Representation of the configuration of TV cards. * Input and output routines. @@ -620,6 +620,19 @@ dvb_core_drivers = add(dvb_core_drivers, mod, parm); }); + // add dvb drivers from media/video directory (search for "*dvb*" modules) + list<string> dvb_extra_drivers = (list<string>)SCR::Dir(video_path); + dvb_extra_drivers = filter(string d, dvb_extra_drivers, {return issubstring(d, "dvb");}); + y2milestone("Extra DVB drivers (from media/video): %1", dvb_extra_drivers); + + if (dvb_extra_drivers != nil && size(dvb_extra_drivers) > 0) + { + foreach(string mod, dvb_extra_drivers, { + map parm = (map) SCR::Read(add(video_path, mod)); + dvb_core_drivers = add(dvb_core_drivers, mod, parm); + }); + } + y2debug("found dvb drivers: %1", dvb_core_drivers); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/src/helps.ycp new/yast2-tv-2.15.1/src/helps.ycp --- old/yast2-tv-2.14.0/src/helps.ycp 2006-10-12 10:34:08.000000000 +0200 +++ new/yast2-tv-2.15.1/src/helps.ycp 2006-11-29 15:41:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Functions returning help texts. * Authors: Jan Holesovsky <kendy(a)suse.cz> * - * $Id: helps.ycp 24742 2005-08-09 14:07:08Z lslezak $ + * $Id: helps.ycp 34644 2006-11-29 14:41:37Z lslezak $ * * All the help texts for the dialogs. */ @@ -52,7 +52,7 @@ define string DetectedDialogHelp() ``{ return // Help: Detected cards, part 1 of 3 -_("<BIG>TV and Radio Card Setup</BIG> +_("<BIG>TV and Radio Card Configuration</BIG> Here, configure your TV and radio cards. ") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/src/tv_proposal.ycp new/yast2-tv-2.15.1/src/tv_proposal.ycp --- old/yast2-tv-2.14.0/src/tv_proposal.ycp 2006-10-12 10:34:08.000000000 +0200 +++ new/yast2-tv-2.15.1/src/tv_proposal.ycp 2006-11-30 14:53:35.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Proposal function dispatcher. * Authors: Jan Holesovsky <kendy(a)suse.cz> * - * $Id: tv_proposal.ycp 23744 2005-06-15 13:06:13Z lslezak $ + * $Id: tv_proposal.ycp 34671 2006-11-30 13:53:33Z lslezak $ * * Proposal function dispatcher for tv configuration. */ @@ -34,14 +34,16 @@ Tv::proposal_valid = true; // Do not show any progress during Read () - Progress::off (); + boolean progress = Progress::set(false); + UI::OpenDialog(`VBox(`Label(_("Detecting TV cards...")))); Tv::ReadCardsDatabase(); Tv::ReadSettings (); Tv::Detect (); Tv::ReadIRC(); UI::CloseDialog(); - Progress::on (); + + Progress::set(progress) ; Tv::Propose (); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/src/ui.ycp new/yast2-tv-2.15.1/src/ui.ycp --- old/yast2-tv-2.14.0/src/ui.ycp 2006-11-10 14:56:06.000000000 +0100 +++ new/yast2-tv-2.15.1/src/ui.ycp 2006-11-30 15:14:57.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: User interface functions. * Authors: Jan Holesovsky <kendy(a)suse.cz> * - * $Id: ui.ycp 34258 2006-11-10 13:56:03Z lslezak $ + * $Id: ui.ycp 34673 2006-11-30 14:14:54Z lslezak $ * * All user interface functions. */ @@ -91,6 +91,7 @@ y2debug("items: %1", items); WizardHW::SetContents(items); + Wizard::SetDesktopIcon("tv"); } @@ -100,7 +101,7 @@ */ define any HardwareDialog() ``{ - WizardHW::CreateHWDialog(_("TV and Radio Card Setup"), + WizardHW::CreateHWDialog(_("TV and Radio Card Configuration"), DetectedDialogHelp(), [_("Number"), _("Card Name")], [] @@ -443,6 +444,14 @@ UI::SetFocus (`id (`vendors_selbox)); + if (Tv::current_card["dvb"]:false) + { + // disable TV channel setup for DVB cards + // DVB scan is currently unsupported + UI::ChangeWidget(`id(`channels), `Enabled, false); + y2milestone("DVB card - disabling TV channel setup button"); + } + do { // Disable/enable the [Select tuner] button diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tv-2.14.0/testsuite/tests/TvReadKernelModules.out new/yast2-tv-2.15.1/testsuite/tests/TvReadKernelModules.out --- old/yast2-tv-2.14.0/testsuite/tests/TvReadKernelModules.out 2006-10-12 10:34:11.000000000 +0200 +++ new/yast2-tv-2.15.1/testsuite/tests/TvReadKernelModules.out 2006-11-30 08:21:06.000000000 +0100 @@ -4,6 +4,7 @@ Dir .modinfo.kernel.drivers.media.dvb.frontends: [] Dir .modinfo.kernel.drivers.media.dvb: [] Dir .modinfo.kernel.drivers.media.dvb.frontends: [] +Dir .modinfo.kernel.drivers.media.video: [] Return true Dump $[] Dump $[] @@ -16,6 +17,7 @@ Dir .modinfo.kernel.drivers.media.dvb.frontends: [] Dir .modinfo.kernel.drivers.media.dvb: [] Dir .modinfo.kernel.drivers.media.dvb.frontends: [] +Dir .modinfo.kernel.drivers.media.video: ["bttv", "zoran"] Return true Dump $["bttv":$["module_description":"bttv - v4l driver module for bt848/878 based cards", "module_filename":"/lib/modules/2.4.4-4GB/kernel/drivers/media/video/bttv.o", "tuner":"specify installed tuner type"], "zoran":$["module_description":"Zoran ZR36120 based framegrabber", "module_filename":"/lib/modules/2.4.4-4GB/kernel/drivers/media/video/zoran.o"]] Dump $["miropcm20":$["module_author":"Ruurd Reitsma", "module_description":"A driver for the Miro PCM20 radio card.", "module_filename":"/lib/modules/2.4.19-4GB/kernel/drivers/media/radio/miropcm20.o", "radio_nr":""]] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-restore
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-restore checked in at Thu Dec 7 20:01:44 CET 2006. -------- --- yast2-restore/yast2-restore.changes 2006-10-10 12:13:39.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-restore/yast2-restore.changes 2006-12-04 09:12:36.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 09:10:02 CET 2006 - locilka(a)suse.cz + +- Fixed restoration of archives containing files with quotes, + spaces, backslashes or other special characters (#220172). +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-restore-2.14.0.tar.bz2 New: ---- yast2-restore-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-restore.spec ++++++ --- /var/tmp/diff_new_pack.EoPqR5/_old 2006-12-07 20:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.EoPqR5/_new 2006-12-07 20:01:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-restore (Version 2.14.0) +# spec file for package yast2-restore (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-restore -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GPL +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-restore-2.14.0.tar.bz2 +Source0: yast2-restore-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite Requires: yast2 yast2-core bzip2 gzip tar yast2-installation yast2-bootloader aaa_base @@ -34,7 +34,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-restore-2.14.0 +%setup -n yast2-restore-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,10 @@ %doc %{prefix}/share/doc/packages/yast2-restore %changelog -n yast2-restore +* Mon Dec 04 2006 - locilka(a)suse.cz +- Fixed restoration of archives containing files with quotes, + spaces, backslashes or other special characters (#220172). +- 2.15.0 * Tue Oct 10 2006 - locilka(a)suse.cz - New version for maintenance - 2.14.0 ++++++ yast2-restore-2.14.0.tar.bz2 -> yast2-restore-2.15.0.tar.bz2 ++++++ ++++ 5176 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/Makefile.am new/yast2-restore-2.15.0/Makefile.am --- old/yast2-restore-2.14.0/Makefile.am 2006-10-10 12:14:26.000000000 +0200 +++ new/yast2-restore-2.15.0/Makefile.am 2006-12-05 13:41:17.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/Makefile.am.common new/yast2-restore-2.15.0/Makefile.am.common --- old/yast2-restore-2.14.0/Makefile.am.common 2006-10-10 12:14:26.000000000 +0200 +++ new/yast2-restore-2.15.0/Makefile.am.common 2006-12-05 13:41:17.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/VERSION new/yast2-restore-2.15.0/VERSION --- old/yast2-restore-2.14.0/VERSION 2006-10-10 12:13:01.000000000 +0200 +++ new/yast2-restore-2.15.0/VERSION 2006-12-04 09:06:46.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/configure.in new/yast2-restore-2.15.0/configure.in --- old/yast2-restore-2.14.0/configure.in 2006-10-10 12:14:25.000000000 +0200 +++ new/yast2-restore-2.15.0/configure.in 2006-12-05 13:41:17.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-restore dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-restore, 2.14.0, http://bugs.opensuse.org/, yast2-restore) +AC_INIT(yast2-restore, 2.15.0, http://bugs.opensuse.org/, yast2-restore) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/src/Restore.ycp new/yast2-restore-2.15.0/src/Restore.ycp --- old/yast2-restore-2.14.0/src/Restore.ycp 2006-10-09 15:50:13.000000000 +0200 +++ new/yast2-restore-2.15.0/src/Restore.ycp 2006-12-04 09:13:11.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: Restore.ycp 24002 2005-07-12 10:10:31Z locilka $ + * $Id: Restore.ycp 34708 2006-12-04 08:13:08Z locilka $ * Representation of the configuration of restore. * Input and output routines. @@ -33,6 +33,7 @@ import "Popup"; import "URL"; import "Message"; + import "String"; textdomain "restore"; @@ -1562,14 +1563,20 @@ if (sel_type == "P") { // strip leading '/' - foreach(string f, info["sel_file"]:[], ``{ - if (size(f) > 1 && substring(f, 0, 1) == "/") - { - unpackfiles = unpackfiles + " " + substring(f, 1); + foreach (string f, info["sel_file"]:[], ``{ + if (size(f) > 1) { + // remove a leading slash + if (substring (f, 0, 1) == "/") f = substring (f, 1); + // every single entry must be quoted + unpackfiles = unpackfiles + " '" + String::Quote (f) + "'"; } } ); } + + // FIXME: use list of files + // for star: list=filename + // for tar: --files-from=filename // create (s)tar command string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " " diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.14.0/src/restore_parse_pkginfo.pl new/yast2-restore-2.15.0/src/restore_parse_pkginfo.pl --- old/yast2-restore-2.14.0/src/restore_parse_pkginfo.pl 2006-10-09 15:50:13.000000000 +0200 +++ new/yast2-restore-2.15.0/src/restore_parse_pkginfo.pl 2006-12-01 11:17:53.000000000 +0100 @@ -11,10 +11,23 @@ print "\$[\n"; +# quoting all >"< and >\< characters +# bugzilla #220172 +sub Quote ($) { + my $string = shift; + + # backslashes are already escaped in the packages_info file + # $string =~ s/\\/\\\\/g; + $string =~ s/\"/\\\"/g; + + return $string; +} + while (my $line = <>) { chomp($line); + # nopackage if (substr($line, 0, length($packagestring)) eq $packagestring || $line eq $nopackagestring) { if ($line ne $nopackagestring) @@ -37,6 +50,7 @@ $prefix = ""; } + # package elsif (substr($line, 0, length($prefixstring)) eq $prefixstring) { $prefix = substr($line, length($prefixstring)); @@ -53,12 +67,17 @@ $first = 0; - print "\"$actualpkg\" : \$[ \"vers\" : \"$actualversion\", \"prefix\" : \"$prefix\", \"sel_type\" : \" \", \"files\" : [\n"; + print "\"". Quote($actualpkg) ."\" : \$[ ". + "\"vers\" : \"". Quote($actualversion) ."\", ". + "\"prefix\" : \"". Quote($prefix) ."\", ". + "\"sel_type\" : \" \", ". + "\"files\" : [\n"; } + # file in a package elsif (substr($line, 0, 1) eq "/") { - print "\"$line\",\n"; + print "\"". Quote($line). "\",\n"; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-client
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-ldap-client checked in at Thu Dec 7 20:01:16 CET 2006. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2006-11-13 13:02:15.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-ldap-client/yast2-ldap-client.changes 2006-12-05 16:00:37.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 5 15:54:13 CET 2006 - jsuchome(a)suse.cz + +- install necessary packages during autoainstallation (#226040) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-2.14.5.tar.bz2 New: ---- yast2-ldap-client-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.7zQNIO/_old 2006-12-07 19:58:09.000000000 +0100 +++ /var/tmp/diff_new_pack.7zQNIO/_new 2006-12-07 19:58:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.14.5) +# spec file for package yast2-ldap-client (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ldap-client -Version: 2.14.5 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.14.5.tar.bz2 +Source0: yast2-ldap-client-2.15.0.tar.bz2 prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite PreReq: %fillup_prereq @@ -42,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-client-2.14.5 +%setup -n yast2-ldap-client-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +83,9 @@ /var/adm/fillup-templates/sysconfig.ldap %changelog -n yast2-ldap-client +* Tue Dec 05 2006 - jsuchome(a)suse.cz +- install necessary packages during autoainstallation (#226040) +- 2.15.0 * Mon Nov 13 2006 - jsuchome(a)suse.cz - save tls_checkpeer value to /etc/ldap.conf (#217701) - 2.14.5 ++++++ yast2-ldap-client-2.14.5.tar.bz2 -> yast2-ldap-client-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.14.5/VERSION new/yast2-ldap-client-2.15.0/VERSION --- old/yast2-ldap-client-2.14.5/VERSION 2006-11-13 12:40:53.000000000 +0100 +++ new/yast2-ldap-client-2.15.0/VERSION 2006-12-05 15:54:46.000000000 +0100 @@ -1 +1 @@ -2.14.5 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.14.5/ldap-client.pot new/yast2-ldap-client-2.15.0/ldap-client.pot --- old/yast2-ldap-client-2.14.5/ldap-client.pot 2005-09-27 14:00:15.000000000 +0200 +++ new/yast2-ldap-client-2.15.0/ldap-client.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,953 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-27 14:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. summary item -#: src/Ldap.ycp:406 -msgid "LDAP Client enabled" -msgstr "" - -#. summary (is LDAP enabled?) -#. summary (LDAP version 2?) -#. summary (use TLS?) -#. summary (client enabled?) -#: src/Ldap.ycp:408 src/Ldap.ycp:418 src/Ldap.ycp:422 src/Ldap.ycp:441 -msgid "Yes" -msgstr "" - -#. summary item -#: src/Ldap.ycp:410 -msgid "LDAP Domain" -msgstr "" - -#. summary item -#: src/Ldap.ycp:413 -msgid "LDAP Server" -msgstr "" - -#. summary item -#: src/Ldap.ycp:416 -msgid "LDAP Version 2" -msgstr "" - -#. summary item -#: src/Ldap.ycp:420 -msgid "LDAP TLS/SSL" -msgstr "" - -#. summary text -#: src/Ldap.ycp:435 -#, ycp-format -msgid "Servers:%1 " -msgstr "" - -#. summary text -#: src/Ldap.ycp:437 -#, ycp-format -msgid "Base DN:%1 " -msgstr "" - -#. summary text (yes/no follows) -#: src/Ldap.ycp:439 -#, ycp-format -msgid "Client Enabled:%1 " -msgstr "" - -#. summary (client enabled?) -#: src/Ldap.ycp:443 -msgid "No" -msgstr "" - -#. error message: -#: src/Ldap.ycp:688 -msgid "" -"\n" -"Server could be down or unreachable." -msgstr "" - -#. error message: -#: src/Ldap.ycp:692 -msgid "" -"\n" -"Value of DN is missing or invalid." -msgstr "" - -#. error message: -#: src/Ldap.ycp:696 -msgid "" -"\n" -"Attribute type not found.\n" -msgstr "" - -#. error message: -#: src/Ldap.ycp:700 -msgid "" -"\n" -"Object class not found.\n" -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:706 -msgid "Connection to LDAP server cannot be established." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:708 -msgid "Problem with connecting to the LDAP server." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:710 -msgid "Problem with reading data from the LDAP server." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:712 -msgid "There was a problem with writing LDAP users." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:714 -msgid "There was a problem with writing LDAP groups." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:716 -msgid "There was a problem with writing data to LDAP server." -msgstr "" - -#. error message, more specific description follows -#: src/Ldap.ycp:718 -msgid "Problem with reading schema from the LDAP server." -msgstr "" - -#. default error message -#: src/Ldap.ycp:736 -msgid "Unknown LDAP error" -msgstr "" - -#. checkbox label -#: src/Ldap.ycp:741 -msgid "&Show Details" -msgstr "" - -#. error message -#: src/Ldap.ycp:850 -msgid "Unknown error. Perhaps 'yast2-ldap' is not available." -msgstr "" - -#. password entering label -#: src/Ldap.ycp:894 -msgid "&Enter the Password for LDAP Server:" -msgstr "" - -#. label -#: src/Ldap.ycp:896 -#, ycp-format -msgid "Server: %1" -msgstr "" - -#. label (%1 is admin DN - string) -#: src/Ldap.ycp:898 -#, ycp-format -msgid "Administrator: %1" -msgstr "" - -#. button label -#: src/Ldap.ycp:903 -msgid "&Anonymous Access" -msgstr "" - -#. error message, %1 is DN -#: src/Ldap.ycp:1234 -#, ycp-format -msgid "" -"A direct parent for DN '%1' \n" -"does not exist in the LDAP directory.\n" -"The object with the selected DN cannot be created.\n" -msgstr "" - -#. error message -#: src/Ldap.ycp:1440 -msgid "" -"Object with selected DN exists, but it is not a template object.\n" -"Select another one.\n" -msgstr "" - -#. progress caption -#: src/Ldap.ycp:1854 -msgid "Writing LDAP Configuration..." -msgstr "" - -#. progress stage label -#: src/Ldap.ycp:1859 -msgid "Stop services" -msgstr "" - -#. progress stage label -#: src/Ldap.ycp:1861 -msgid "Update configuration files" -msgstr "" - -#. progress stage label -#: src/Ldap.ycp:1863 -msgid "Start services" -msgstr "" - -#. progress stage label -#: src/Ldap.ycp:1865 -msgid "Update configuration in LDAP directory" -msgstr "" - -#. progress step label -#: src/Ldap.ycp:1868 -msgid "Stopping services..." -msgstr "" - -#. progress step label -#: src/Ldap.ycp:1870 -msgid "Updating configuration files..." -msgstr "" - -#. progress step label -#: src/Ldap.ycp:1872 -msgid "Starting services..." -msgstr "" - -#. progress step label -#: src/Ldap.ycp:1874 -msgid "Updating configuration in LDAP directory..." -msgstr "" - -#. final progress step label -#: src/Ldap.ycp:1876 -msgid "Finished" -msgstr "" - -#. yes/no popup, %1 is value of DN -#: src/Ldap.ycp:2160 -#, ycp-format -msgid "" -"No entry with DN '%1'\n" -"exists on the LDAP server. Create it now?\n" -msgstr "" - -#. button label -#: src/LdapPopup.ycp:55 -msgid "&Open" -msgstr "" - -#. help text 1/3 -#: src/LdapPopup.ycp:223 -msgid "Set the new value for the current attribute." -msgstr "" - -#. help text 2/3 -#: src/LdapPopup.ycp:226 -msgid "" -"If the attribute can have more values, add new entries\n" -"with Add Value. Sometimes the button contains the list of\n" -"possible values to use for the current attribute.\n" -"If the value of the edited attribute should be a distinguished name (DN),\n" -"it is possible to choose it from LDAP tree using Browse.\n" -"\n" -msgstr "" - -#. help text 3/3, %1 is attribute name, description follows. -#. The description will be not translated: maybe add a note -#. "available only in english" to the sentence for other languages? -#. Example: -#. "The description of attribute \"%1\" (available only in english):" -#. or: -#. "The description (only in english) of attribute \"%1\": " -#: src/LdapPopup.ycp:244 -#, ycp-format -msgid "The description of attribute \"%1\": " -msgstr "" - -#. textentry label -#: src/LdapPopup.ycp:263 -#, ycp-format -msgid "&Value of \"%1\" Attribute" -msgstr "" - -#. textentry label -#: src/LdapPopup.ycp:269 -#, ycp-format -msgid "&Values of \"%1\" Attribute" -msgstr "" - -#. button label -#: src/LdapPopup.ycp:284 src/LdapPopup.ycp:296 -msgid "&Add Value" -msgstr "" - -#. menubutton item (default value) -#: src/LdapPopup.ycp:289 -msgid "&Empty Entry" -msgstr "" - -#. button label -#: src/LdapPopup.ycp:291 src/ui.ycp:631 src/ui.ycp:664 -msgid "Bro&wse" -msgstr "" - -#. error popup -#: src/LdapPopup.ycp:370 -#, ycp-format -msgid "" -"The value '%1' already exists.\n" -"Please select another one." -msgstr "" - -#. description of configuration object -#: src/LdapPopup.ycp:395 -msgid "Configuration of user management tools" -msgstr "" - -#. description of configuration object -#: src/LdapPopup.ycp:397 -msgid "Configuration of group management tools" -msgstr "" - -#. label -#: src/LdapPopup.ycp:400 -msgid "Object Class of New Module" -msgstr "" - -#. textentry label, do not translate "cn" -#: src/LdapPopup.ycp:413 -msgid "&Name of New Module (\"cn\" value)" -msgstr "" - -#. error popup -#: src/LdapPopup.ycp:440 -msgid "" -"The entered value already exists.\n" -"Select another one.\n" -msgstr "" - -#. error popup -#: src/LdapPopup.ycp:448 -msgid "Enter the module name." -msgstr "" - -#. help text 1/3 -#: src/LdapPopup.ycp:468 -msgid "" -"Here, set the values of attributes belonging\n" -"to an object using the current template. Such values are used as defaults when\n" -"the new object is created.\n" -msgstr "" - -#. -#. // help text 2/3 do not translate "defaultObjectClass" -#. _("The list of attributes provided in Attribute Name is the -#. list of allowed attributes for objects described in the \"defaultObjectClass\" -#. entry of the current template. -#. ") + -#. -#. help text 3/3 do not translate "homedirectory" -#: src/LdapPopup.ycp:482 -msgid "" -"You can use special syntax to create attribute\n" -"values from existing ones. The expression %attr_name will be replaced\n" -"with the value of attribute \"attr_name\" (for example, use \"/home/%uid\"\n" -"as a value of \"homeDirectory\").\n" -msgstr "" - -#. combobox label -#: src/LdapPopup.ycp:496 -msgid "Attribute &Name" -msgstr "" - -#. textentry label -#: src/LdapPopup.ycp:500 -msgid "Attribute &Value" -msgstr "" - -#. translators: command line help text for Ldap client module -#: src/ldap.ycp:91 -msgid "LDAP client configuration module." -msgstr "" - -#. translators: command line help text for pam action -#: src/ldap.ycp:99 -msgid "Enable or disable authentication with LDAP" -msgstr "" - -#. translators: command line help text for summary action -#: src/ldap.ycp:104 -msgid "Configuration summary of LDAP client" -msgstr "" - -#. translators: command line help text for configure action -#: src/ldap.ycp:109 -msgid "Change the global settings of LDAP client" -msgstr "" - -#. translators: command line help text for pam enable option -#: src/ldap.ycp:115 -msgid "Enable the service" -msgstr "" - -#. translators: command line help text for pam disable option -#: src/ldap.ycp:119 -msgid "Disable the service" -msgstr "" - -#. translators: command line help text for the server option -#: src/ldap.ycp:123 -msgid "The LDAP server name" -msgstr "" - -#. translators: command line help text for the base option -#: src/ldap.ycp:128 -msgid "Distinguished Name (DN) of the search base" -msgstr "" - -#. popup text -#: src/ui.ycp:76 -msgid "Really abort the writing process?" -msgstr "" - -#. help text -#: src/ui.ycp:84 -msgid "Writing LDAP Client Settings" -msgstr "" - -#. popup window -#: src/ui.ycp:100 -msgid "Scanning for LDAP servers provided by SLP..." -msgstr "" - -#. multiselection box label -#: src/ui.ycp:119 -msgid "LDAP &Servers Provided by SLP:" -msgstr "" - -#. help text 1/9 -#: src/ui.ycp:147 -msgid "" -"Here, your machine can be set up as an\n" -"LDAP client." -msgstr "" - -#. help text 2/9 -#: src/ui.ycp:151 -msgid "To authenticate your users with an OpenLDAP server, select Use LDAP. NSS and PAM will be configured accordingly." -msgstr "" - -#. help text 3/9 -#: src/ui.ycp:154 -msgid "" -"To deactivate LDAP services, click Do Not Use LDAP.\n" -"If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" -"will be removed. The PAM configuration will be modified and the LDAP entry\n" -"removed." -msgstr "" - -#. help text 3.5/9 -#: src/ui.ycp:160 -msgid "To activate LDAP but forbid users from logging in to this machine, select Enable LDAP Users but Disable Logins." -msgstr "" - -#. help text 4/9 -#: src/ui.ycp:163 -msgid "" -"Enter the LDAP server's address (e.g., ldap.example.com or 10.20.0.2) in the first entry and Distinguished Name of the search base (\"base DN\", such as dc=example,dc=com) in the second. Specify multiple servers\n" -"by separating their addresses with spaces. It must be possible to resolve the\n" -"addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, ldap.example.com:379.\n" -"\n" -msgstr "" - -#. help text 5/9 -#: src/ui.ycp:170 -msgid "With Find, select the LDAP server from the list provided by the service location protocol (SLP). Using Fetch DN, read the base DN from server." -msgstr "" - -#. help text 6/9 -#: src/ui.ycp:173 -msgid "" -"Some LDAP servers support StartTLS [RFC2830].\n" -"If your server supports it and it is configured, activate LDAP TLS/SSL\n" -"to encrypt your communication with the LDAP server." -msgstr "" - -#. help text 7/9 -#: src/ui.ycp:178 -msgid "" -"Normally, the LDAP version 3 protocol will be used. If you have\n" -"an LDAP server using protocol 2 (for example, OpenLDAP v1), activate\n" -"LDAP Version 2.\n" -msgstr "" - -#. help text 8/9 -#: src/ui.ycp:184 -msgid "" -"For configuration of advanced LDAP settings, click\n" -"Advanced Configuration.\n" -msgstr "" - -#. help text 9/9 (additional) -#: src/ui.ycp:188 -msgid "" -"Automounter is a daemon that automatically mounts directories,\n" -"such as users' home directories.\n" -"It is assumed that its configuration files (auto.*) already exist\n" -"locally or over LDAP.\n" -"If it is not installed and you want to use it, it is installed\n" -"automatically.\n" -msgstr "" - -#. check box label -#: src/ui.ycp:215 -msgid "Start Auto&mounter" -msgstr "" - -#. frame label -#: src/ui.ycp:223 -msgid "User Authentication" -msgstr "" - -#. radio button label -#: src/ui.ycp:229 -msgid "Do N&ot Use LDAP" -msgstr "" - -#. radio button label -#: src/ui.ycp:232 -msgid "&Use LDAP" -msgstr "" - -#. radio button label -#: src/ui.ycp:235 -msgid "Use LDAP but Disable &Logins" -msgstr "" - -#. frame label -#: src/ui.ycp:243 -msgid "LDAP client" -msgstr "" - -#. text entry label -#: src/ui.ycp:247 -msgid "Addresses of LDAP &Servers" -msgstr "" - -#. push button label -#: src/ui.ycp:252 -msgid "F&ind" -msgstr "" - -#. text entry label -#: src/ui.ycp:257 -msgid "LDAP base &DN" -msgstr "" - -#. push button label -#: src/ui.ycp:261 -msgid "F&etch DN" -msgstr "" - -#. check box label -#: src/ui.ycp:266 -msgid "LDAP &TLS/SSL" -msgstr "" - -#. check box label -#: src/ui.ycp:269 -msgid "LDAP &Version 2" -msgstr "" - -#. pushbutton label -#: src/ui.ycp:275 -msgid "&Advanced Configuration..." -msgstr "" - -#. dialog title -#. dialog label -#: src/ui.ycp:280 src/wizards.ycp:73 -msgid "LDAP Client Configuration" -msgstr "" - -#. error popup label -#: src/ui.ycp:330 -msgid "Enter an LDAP base DN." -msgstr "" - -#. error popup label -#: src/ui.ycp:338 -msgid "Enter at least one address of an LDAP server." -msgstr "" - -#. popup question: user enabled LDAP now, but probably has -#. enabled NIS client before -#: src/ui.ycp:354 -msgid "" -"When you configure your machine as an LDAP client,\n" -"you cannot retrieve data with NIS. Are you sure?\n" -msgstr "" - -#. popup question -#: src/ui.ycp:368 -msgid "" -"An active configuration of the Kerberos client is present.\n" -"Which should be used as the primary authentication service?\n" -msgstr "" - -#. button label (authentication service) -#: src/ui.ycp:372 -msgid "&LDAP" -msgstr "" - -#. button label (authentication service) -#: src/ui.ycp:374 -msgid "&Kerberos" -msgstr "" - -#. popup text -#: src/ui.ycp:432 -msgid "Now you have enabled LDAP." -msgstr "" - -#. message popup, part 1/2 -#: src/ui.ycp:436 -msgid "" -"This change only affects newly created processes and not already\n" -"running services. Restart your services manually or reboot \n" -"the machine to enable it for all services.\n" -msgstr "" - -#. message popup, part 1/2 -#: src/ui.ycp:445 -msgid "" -"\n" -"To enable remote login for LDAP users, 'sshd' will be\n" -"restarted automatically by YaST.\n" -msgstr "" - -#. help text caption 1 -#: src/ui.ycp:476 -msgid "Advanced LDAP Client Settings" -msgstr "" - -#. help text 1/3 -#: src/ui.ycp:479 -msgid "" -"Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n" -"set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n" -"in /etc/ldap.conf file.\n" -msgstr "" - -#. help text 2/3 -#: src/ui.ycp:485 -msgid "Password Change Protocol refers to the pam_password attribute of /etc/ldap.conf file. See <tt>man pam_ldap</tt> for the meaning of its values." -msgstr "" - -#. help text 3/3, %1 is attribute name -#: src/ui.ycp:488 -#, ycp-format -msgid "" -"Set the type of LDAP groups you are using.\n" -"The default value for Group Member Attribute is %1." -msgstr "" - -#. help text caption 2 -#: src/ui.ycp:494 -msgid "Access to Server" -msgstr "" - -#. help text 1/4 -#: src/ui.ycp:497 -msgid "" -"First, set Configuration Base DN.\n" -"It is the base for storing your configuration data, which is saved on the LDAP\n" -"server.\n" -msgstr "" - -#. help text 2/4 -#: src/ui.ycp:503 -msgid "" -"To access the data stored on the server, enter the\n" -"Administrator DN (e.g., cn=Administrator,dc=mydomain,dc=com).\n" -msgstr "" - -#. help text 3/4 -#: src/ui.ycp:508 -msgid "" -"To create the default configuration objects for LDAP users and groups,\n" -"check Create Default Configuration Objects. The objects are only created when they do not already exist.\n" -msgstr "" - -#. help text 4/4 -#: src/ui.ycp:513 -msgid "" -"Press Configure to configure settings stored on the\n" -"LDAP server. You will be asked for the password if you are not connected yet or\n" -"have changed your configuration.\n" -msgstr "" - -#. help text caption 3 -#: src/ui.ycp:519 -msgid "Home Directories" -msgstr "" - -#. help text 1/1 -#: src/ui.ycp:522 -msgid "" -"If home directories of users should be stored on this machine,\n" -"check the appropriate option. Changing this value does not cause any direct\n" -"action. It is only information for the YaST users module, which can manage\n" -"user home directories.\n" -msgstr "" - -#. tab label -#: src/ui.ycp:573 -msgid "C&lient Settings" -msgstr "" - -#. tab label -#: src/ui.ycp:575 -msgid "Ad&ministration Settings" -msgstr "" - -#. frame label -#: src/ui.ycp:601 -msgid "Naming Contexts" -msgstr "" - -#. textentry label -#: src/ui.ycp:607 -msgid "&User Map" -msgstr "" - -#. button label -#: src/ui.ycp:611 -msgid "&Browse" -msgstr "" - -#. textentry label -#: src/ui.ycp:617 -msgid "&Password Map" -msgstr "" - -#. button label -#: src/ui.ycp:621 -msgid "Br&owse" -msgstr "" - -#. textentry label -#: src/ui.ycp:627 -msgid "&Group Map" -msgstr "" - -#. combobox label -#: src/ui.ycp:641 -msgid "Pa&ssword Change Protocol" -msgstr "" - -#. combobox label -#: src/ui.ycp:645 -msgid "G&roup Member Attribute" -msgstr "" - -#. textentry label -#: src/ui.ycp:660 -msgid "Configuration &Base DN" -msgstr "" - -#. textentry label -#: src/ui.ycp:670 -msgid "Administrator &DN" -msgstr "" - -#. checkbox label -#: src/ui.ycp:674 -msgid "Crea&te Default Configuration Objects" -msgstr "" - -#. pushbutton label -#: src/ui.ycp:678 -msgid "Configure User Management &Settings..." -msgstr "" - -#. checkbox label -#: src/ui.ycp:682 -msgid "&Home Directories on This Machine" -msgstr "" - -#. dialog label -#: src/ui.ycp:699 -msgid "Advanced Configuration" -msgstr "" - -#. error popup label -#: src/ui.ycp:772 -msgid "Enter the DN used for binding to the LDAP server." -msgstr "" - -#. error popup label -#: src/ui.ycp:780 -msgid "Enter the configuration base DN" -msgstr "" - -#. yes/no popup -#: src/ui.ycp:867 -msgid "" -"Reread settings from server?\n" -"All changes will be lost.\n" -msgstr "" - -#. help text 1/3 -#: src/ui.ycp:891 -msgid "" -"Here, configure the template used for\n" -"creating new objects (like users or groups).\n" -msgstr "" - -#. help text 2/3 -#: src/ui.ycp:896 -msgid "" -"Edit the template attribute values with Edit.\n" -"Changing the cn value renames the template.\n" -msgstr "" - -#. help text 3/3 -#: src/ui.ycp:901 -msgid "" -"The second table contains a list of default values, used\n" -"for new objects. Modify the list by adding new values and editing or\n" -"removing current ones.\n" -msgstr "" - -#. table header 1/2 -#: src/ui.ycp:943 src/ui.ycp:1233 -msgid "Attribute" -msgstr "" - -#. table header 2/2 -#: src/ui.ycp:945 src/ui.ycp:1235 -msgid "Value" -msgstr "" - -#. label (table folows) -#: src/ui.ycp:952 -msgid "Default Values for New Objects" -msgstr "" - -#. table header 1/2 -#: src/ui.ycp:955 -msgid "Attribute of Object" -msgstr "" - -#. table header 2/2 -#: src/ui.ycp:957 -msgid "Default Value" -msgstr "" - -#. button label (with non-default shortcut) -#: src/ui.ycp:961 -msgid "A&dd" -msgstr "" - -#. button label -#: src/ui.ycp:963 -msgid "&Edit" -msgstr "" - -#. dialog label -#: src/ui.ycp:973 -msgid "Object Template Configuration" -msgstr "" - -#. yes/no popup, %1 is name -#: src/ui.ycp:1072 -#, ycp-format -msgid "Really delete default attribute \"%1\"?" -msgstr "" - -#. error popup, %1 is attribute name -#: src/ui.ycp:1094 src/ui.ycp:1274 -#, ycp-format -msgid "" -"The \"%1\" attribute is mandatory.\n" -"Enter a value." -msgstr "" - -#. helptext 1/4 -#: src/ui.ycp:1116 -msgid "Here, manage the configuration stored in LDAP directory." -msgstr "" - -#. helptext 2/4 -#: src/ui.ycp:1119 -msgid "" -"Each configuration set is called a configuration module. If there\n" -"is no configuration module in the provided location (Base Configuration),\n" -"create one with New. Delete the current module\n" -"using Delete.\n" -msgstr "" - -#. helptext 3/4 -#: src/ui.ycp:1126 -msgid "" -"Edit the values of attributes in the table with Edit.\n" -"Some values have special meanings, for example, changing the cn value renames the\n" -"current module.\n" -msgstr "" - -#. helptext 4/4 -#: src/ui.ycp:1132 -msgid "" -"To configure the default template of the current module,\n" -"click Configure Template.\n" -"\n" -msgstr "" - -#. combobox label -#: src/ui.ycp:1200 -msgid "Configuration &Module" -msgstr "" - -#. button label -#: src/ui.ycp:1217 -msgid "C&onfigure Template" -msgstr "" - -#. dialog label -#: src/ui.ycp:1247 -msgid "Module Configuration" -msgstr "" - -#. yes/no popup, %1 is name -#: src/ui.ycp:1298 -#, ycp-format -msgid "Really delete module \"%1\"?" -msgstr "" - -#. message -#: src/ui.ycp:1330 -msgid "" -"You currently have configuration modules\n" -"of each type, so you cannot add a new one." -msgstr "" - -#. label (init dialog) -#: src/wizards.ycp:75 -msgid "Initializing ..." -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.14.5/src/Ldap.ycp new/yast2-ldap-client-2.15.0/src/Ldap.ycp --- old/yast2-ldap-client-2.14.5/src/Ldap.ycp 2006-11-13 12:38:07.000000000 +0100 +++ new/yast2-ldap-client-2.15.0/src/Ldap.ycp 2006-12-05 14:39:32.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 32783 2006-09-08 14:37:27Z jsuchome $ + * $Id: Ldap.ycp 34300 2006-11-13 12:03:44Z jsuchome $ */ { @@ -2149,6 +2149,7 @@ WriteLdapConfEntry ("nss_base_group", (nss_base_group != "")? nss_base_group : user_base); + // override LDAPNOINIT (#217701) WriteLdapConfEntry ("tls_checkpeer", "no"); if (!oes) @@ -2405,6 +2406,10 @@ * @return map of lists. */ global define map AutoPackages() ``{ + + if (start) + required_packages = (list<string>) + union (required_packages, ["pam_ldap", "nss_ldap"]); list<string> install_pkgs = UpdatedArchPackages (required_packages); list remove_pkgs = []; return ($["install": install_pkgs, "remove": remove_pkgs]); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-irda
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-irda checked in at Thu Dec 7 19:58:04 CET 2006. -------- --- yast2-irda/yast2-irda.changes 2006-11-06 12:11:16.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-irda/yast2-irda.changes 2006-12-01 17:03:59.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 1 16:35:25 CET 2006 - jsuchome(a)suse.cz + +- do not show untranslated messages (#221701) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-irda-2.14.0.tar.bz2 New: ---- yast2-irda-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-irda.spec ++++++ --- /var/tmp/diff_new_pack.soAJTF/_old 2006-12-07 19:57:34.000000000 +0100 +++ /var/tmp/diff_new_pack.soAJTF/_new 2006-12-07 19:57:34.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-irda (Version 2.14.0) +# spec file for package yast2-irda (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-irda -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-irda-2.14.0.tar.bz2 +Source0: yast2-irda-2.15.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -34,7 +34,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-irda-2.14.0 +%setup -n yast2-irda-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +68,9 @@ %doc %{prefix}/share/doc/packages/yast2-irda %changelog -n yast2-irda +* Fri Dec 01 2006 - jsuchome(a)suse.cz +- do not show untranslated messages (#221701) +- 2.15.0 * Mon Nov 06 2006 - jsuchome(a)suse.cz - new version for new product - 2.14.0 ++++++ yast2-irda-2.14.0.tar.bz2 -> yast2-irda-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-irda-2.14.0/VERSION new/yast2-irda-2.15.0/VERSION --- old/yast2-irda-2.14.0/VERSION 2006-11-06 12:03:47.000000000 +0100 +++ new/yast2-irda-2.15.0/VERSION 2006-12-01 16:35:53.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-irda-2.14.0/src/ui.ycp new/yast2-irda-2.15.0/src/ui.ycp --- old/yast2-irda-2.14.0/src/ui.ycp 2005-09-08 10:31:54.000000000 +0200 +++ new/yast2-irda-2.15.0/src/ui.ycp 2006-12-01 16:35:19.000000000 +0100 @@ -90,8 +90,8 @@ UI::CloseDialog(); if (start != "") { - Popup::Error (sformat ("%1 -%2", Message::CannotStartService ("irda"), start)); + y2error ("irda service returns: %1", start); + Popup::Error (Message::CannotStartService ("irda")); irda_tmp_stop (); return false; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-instserver
by root＠suse.de 07 Dec '06

07 Dec '06

Hello community, here is the log from the commit of package yast2-instserver checked in at Thu Dec 7 19:57:28 CET 2006. -------- --- yast2-instserver/yast2-instserver.changes 2006-11-13 14:18:05.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-instserver/yast2-instserver.changes 2006-12-06 14:53:14.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 6 14:17:39 CET 2006 - lslezak(a)suse.cz + +- write hostname to SLP registration file (#158172) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-instserver-2.14.0.tar.bz2 New: ---- yast2-instserver-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-instserver.spec ++++++ --- /var/tmp/diff_new_pack.iVMk7a/_old 2006-12-07 19:56:52.000000000 +0100 +++ /var/tmp/diff_new_pack.iVMk7a/_new 2006-12-07 19:56:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-instserver (Version 2.14.0) +# spec file for package yast2-instserver (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-instserver URL: http://www.suse.com/ -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-instserver-2.14.0.tar.bz2 +Source0: yast2-instserver-2.15.0.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite Requires: yast2, yast2-slp @@ -37,7 +37,7 @@ Anas Nashif <nashif(a)suse.de> %prep -%setup -n yast2-instserver-2.14.0 +%setup -n yast2-instserver-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +76,9 @@ %dir /etc/apache2/conf.d %changelog -n yast2-instserver +* Wed Dec 06 2006 - lslezak(a)suse.cz +- write hostname to SLP registration file (#158172) +- 2.15.0 * Mon Nov 13 2006 - lslezak(a)suse.cz - 2.14.0 * Wed Aug 16 2006 - lslezak(a)suse.cz ++++++ yast2-instserver-2.14.0.tar.bz2 -> yast2-instserver-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/VERSION new/yast2-instserver-2.15.0/VERSION --- old/yast2-instserver-2.14.0/VERSION 2006-11-13 14:12:50.000000000 +0100 +++ new/yast2-instserver-2.15.0/VERSION 2006-12-06 14:17:35.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/configure new/yast2-instserver-2.15.0/configure --- old/yast2-instserver-2.14.0/configure 2006-11-13 14:14:10.000000000 +0100 +++ new/yast2-instserver-2.15.0/configure 2006-12-06 14:52:02.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-instserver 2.14.0. +# Generated by GNU Autoconf 2.60 for yast2-instserver 2.15.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-instserver' PACKAGE_TARNAME='yast2-instserver' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-instserver 2.14.0' +PACKAGE_VERSION='2.15.0' +PACKAGE_STRING='yast2-instserver 2.15.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1180,7 +1180,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-instserver 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-instserver 2.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1251,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-instserver 2.14.0:";; + short | recursive ) echo "Configuration of yast2-instserver 2.15.0:";; esac cat <<\_ACEOF @@ -1329,7 +1329,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-instserver configure 2.14.0 +yast2-instserver configure 2.15.0 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1343,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-instserver $as_me 2.14.0, which was +It was created by yast2-instserver $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2144,7 @@ # Define the identity of the package. PACKAGE='yast2-instserver' - VERSION='2.14.0' + VERSION='2.15.0' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2371,7 @@ -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-instserver" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3227,7 +3227,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-instserver $as_me 2.14.0, which was +This file was extended by yast2-instserver $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3270,7 +3270,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-instserver config.status 2.14.0 +yast2-instserver config.status 2.15.0 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/configure.in new/yast2-instserver-2.15.0/configure.in --- old/yast2-instserver-2.14.0/configure.in 2006-11-13 14:14:05.000000000 +0100 +++ new/yast2-instserver-2.15.0/configure.in 2006-12-06 14:51:56.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-instserver, 2.14.0, http://bugs.opensuse.org/, yast2-instserver) +AC_INIT(yast2-instserver, 2.15.0, http://bugs.opensuse.org/, yast2-instserver) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-instserver" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.14.0/src/Instserver.ycp new/yast2-instserver-2.15.0/src/Instserver.ycp --- old/yast2-instserver-2.14.0/src/Instserver.ycp 2006-11-13 14:12:29.000000000 +0100 +++ new/yast2-instserver-2.15.0/src/Instserver.ycp 2006-12-06 14:51:49.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Installation Server settings, input and output functions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Instserver.ycp 33335 2006-10-12 08:04:36Z lslezak $ + * $Id: Instserver.ycp 34794 2006-12-06 13:51:46Z lslezak $ * * Representation of the configuration of Installation Server. * Input and output routines. @@ -476,6 +476,17 @@ return (IP::ToString(ip)); } +global string GetHostname() +{ + map output = (map)SCR::Execute( .target.bash_output, "/bin/hostname --long" ); + y2milestone("hostname --long: %1", output); + string hostname = output["stdout"]:""; + + hostname = splitstring(hostname, "\n")[0]:""; + + return hostname; +} + /** * Write SLP configuration */ @@ -484,6 +495,7 @@ y2debug("WriteSLPReg(%1)", cm); string ip = GetIPAddr(); + string hostname = GetHostname(); string serv = ""; string regfile = sformat("YaST-%1.reg", cm["name"]:"" ); if (ServerSettings["service"]:`none == `nfs) @@ -532,20 +544,16 @@ } } - string descr = sformat("%1 ++%2++", cm["LABEL"]:"" , cm["DISTPRODUCT"]:"" ); - - string cmd = sformat("grep description %1 | grep -c \"%2\"", checkfiles, descr); - map bashret = (map)SCR::Execute(.target.bash_output, cmd); - y2debug("description bashret: %1", bashret); - if (bashret["exit"]:-1 == 0) + string hostname_reg = ""; + // add the hostname + if (hostname != nil && hostname != "" && haskey(attr, "label")) { - attr["description"] = sformat("%1 #%2", descr, - substring(bashret["stdout"]:"", 0 , 1 ) ); - } - else - { - attr["description"] = sformat("%1", descr ); + hostname_reg = hostname + ": "; } + + string descr = sformat("%1 (%2)", cm["LABEL"]:"" , cm["DISTPRODUCT"]:"" ); + attr["description"] = hostname_reg + descr; + string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0