Author: branden Date: 2004-08-30 14:24:01 -0500 (Mon, 30 Aug 2004) New Revision: 1769
Modified: trunk/debian/CHANGESETS trunk/debian/changelog trunk/debian/xserver-xfree86.config.in Log: Make xserver-xfree86 config script's validate_monitor_frequency_db_input() function more strict, so it doesn't regard open-ended ranges like "40-" as valid. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-08-30 19:11:01 UTC (rev 1768) +++ trunk/debian/CHANGESETS 2004-08-30 19:24:01 UTC (rev 1769) @@ -489,8 +489,9 @@ xserver-xfree86.config.in. Thanks to Anders Dybdal. 1764 -* Fix validate_monitor_frequency_db_input() regexp to match for proper - values. - 1766 +Make xserver-xfree86 config script's validate_monitor_frequency_db_input() +function more strict, so it doesn't regard open-ended ranges like "40-" as +valid. + 1766, 1769 vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-08-30 19:11:01 UTC (rev 1768) +++ trunk/debian/changelog 2004-08-30 19:24:01 UTC (rev 1769) @@ -415,6 +415,10 @@ redirect them, which is precisely what we don't want (see section 6.5 of the Debian Policy Manual). + * Make xserver-xfree86 config script's validate_monitor_frequency_db_input() + function more strict, so it doesn't regard open-ended ranges like "40-" as + valid. + Changes by Robert Millan: * Get glxinfo to link properly with g++ (instead of adding -lstdc++). @@ -434,11 +438,8 @@ * Add Danish translation of "Generic Video Card" to xserver-xfree86.config.in. Thanks to Anders Dybdal. - * Fix validate_monitor_frequency_db_input() regexp to match for proper - values. + -- Branden Robinson <[EMAIL PROTECTED]> Mon, 30 Aug 2004 14:22:49 -0500 - -- Branden Robinson <[EMAIL PROTECTED]> Wed, 25 Aug 2004 11:41:15 -0500 - xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low Changes by Branden Robinson: Modified: trunk/debian/xserver-xfree86.config.in =================================================================== --- trunk/debian/xserver-xfree86.config.in 2004-08-30 19:11:01 UTC (rev 1768) +++ trunk/debian/xserver-xfree86.config.in 2004-08-30 19:24:01 UTC (rev 1769) @@ -274,10 +274,12 @@ fi db_go db_get "$TEMPLATE" - # string, needs input validation; a simple regex match will have to do; - # force first character to be a number to avoid hideous problems in the - # debconf dialog frontend in 0.3.83 (it needs to be one anyway) - if [ "$(echo "$RET" | grep -E '^[0-9]{2,3}-[0-9]{2,3}')" ]; then + # This is a string, and needs input validation; a regex match will have to + # do. We force the first character to be a number to avoid hideous problems + # in the debconf dialog frontend in 0.3.83 (it needs to be one anyway). + # We don't allow values less than 10. + if echo "$RET" | grep -qE \ + '^[0-9]{2,3}(\.[0-9]+)?(-[0-9]{2,3}(\.[0-9]+)?)?'; then break # valid input fi # we only get to this point if the input was invalid; restore the known