Author: kmachalkova Date: Thu Nov 26 19:24:30 2009 New Revision: 59814 URL: http://svn.opensuse.org/viewcvs/yast?rev=59814&view=rev Log: Make testsuite pass again, adjust deps Modified: trunk/firewall/VERSION trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/uifunctions.ycp trunk/firewall/yast2-firewall.spec.in Modified: trunk/firewall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/VERSION?rev=59814&r1=59813&r2=59814&view=diff ============================================================================== --- trunk/firewall/VERSION (original) +++ trunk/firewall/VERSION Thu Nov 26 19:24:30 2009 @@ -1 +1 @@ -2.18.1 +2.19.0 Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.changes?rev=59814&r1=59813&r2=59814&view=diff ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Thu Nov 26 19:24:30 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 26 19:20:16 CET 2009 - kmachalkova@suse.cz + +- Adapted to new Netmask API - prefix and netmask are now checked + by two separate functions +- 2.19.0 + +------------------------------------------------------------------- Fri Nov 20 13:12:06 CET 2009 - locilka@suse.cz - Added description to the list of allowed services (FATE #306804). Modified: trunk/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/uifunctions.ycp?rev=59814&r1=59813&r2=59814&view=diff ============================================================================== --- trunk/firewall/src/uifunctions.ycp (original) +++ trunk/firewall/src/uifunctions.ycp Thu Nov 26 19:24:30 2009 @@ -80,7 +80,7 @@ string network_ip = regexpsub (network, "^([0123456789\.]+)/[0123456789]+$", "\\1"); string network_mask = regexpsub (network, "^[0123456789\.]+/([0123456789]+)$", "\\1"); - ret = (IP::Check4 (network_ip) && Netmask::Check4 (network_mask)); + ret = (IP::Check4 (network_ip) && Netmask::CheckPrefix4 (network_mask)); // 192.168.0.0/255.255.255.0, 0.8.55/10.258.12 } else if (regexpmatch(network, "^[0123456789\.]+/[0123456789\.]+$")) { Modified: trunk/firewall/yast2-firewall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/yast2-firewall.spec.in?rev=59814&r1=59813&r2=59814&view=diff ============================================================================== --- trunk/firewall/yast2-firewall.spec.in (original) +++ trunk/firewall/yast2-firewall.spec.in Thu Nov 26 19:24:30 2009 @@ -6,8 +6,8 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.16.47 -# SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773 -Requires: yast2 >= 2.17.6 +# Netmask::CheckPrefix4 +Requires: yast2 >= 2.18.26 # ButtonBox widget Conflicts: yast2-ycp-ui-bindings < 2.17.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org