|
 |
7b9d9a9 |
diff -up kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake
|
|
|
7b9d9a9 |
--- kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake.orig 2009-07-27 10:59:51.000000000 +0200
|
|
|
7b9d9a9 |
+++ kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake 2009-07-27 11:01:23.000000000 +0200
|
|
|
7b9d9a9 |
@@ -71,7 +71,7 @@ $version = "@VERSION@";
|
|
|
7b9d9a9 |
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
|
|
|
7b9d9a9 |
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04",
|
|
|
7b9d9a9 |
"suse-7.0", "suse-9.0", "suse-9.1",
|
|
|
7b9d9a9 |
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "specifix", "yoper-2.1", "yoper-2.2",
|
|
|
7b9d9a9 |
+ "turbolinux-7.0", "fedora", "specifix", "yoper-2.1", "yoper-2.2",
|
|
|
7b9d9a9 |
"pld-1.0", "pld-1.1", "pld-1.99",
|
|
|
7b9d9a9 |
"conectiva-9", "conectiva-10",
|
|
|
7b9d9a9 |
"mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", "mandriva-2008.0", "mandriva-2008.1",
|
|
|
7b9d9a9 |
diff -up kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake
|
|
|
7b9d9a9 |
--- kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake.orig 2009-07-27 11:01:31.000000000 +0200
|
|
|
7b9d9a9 |
+++ kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake 2009-07-27 11:03:12.000000000 +0200
|
|
|
7b9d9a9 |
@@ -525,9 +525,7 @@ sub gst_network_get_broadcast_ping_cmd
|
|
|
7b9d9a9 |
"pld-1.99" => "redhat-6.2",
|
|
|
7b9d9a9 |
"conectiva-9" => "debian-2.2",
|
|
|
7b9d9a9 |
"conectiva-10" => "debian-2.2",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-6.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-6.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-6.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-6.2",
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-6.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-6.2",
|
|
|
7b9d9a9 |
"specifix" => "redhat-6.2",
|
|
|
7b9d9a9 |
@@ -1824,9 +1822,7 @@ sub gst_network_get_file
|
|
|
7b9d9a9 |
"pld-1.0" => \&gst_network_pld10_get_file,
|
|
|
7b9d9a9 |
"pld-1.1" => \&gst_network_pld10_get_file,
|
|
|
7b9d9a9 |
"pld-1.99" => \&gst_network_pld10_get_file,
|
|
|
7b9d9a9 |
- "fedora-1" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
- "fedora-2" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
- "fedora-3" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
+ "fedora" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
"yoper-2.1" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
"yoper-2.2" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
"specifix" => \&gst_network_rh72_get_file,
|
|
|
7b9d9a9 |
@@ -3943,9 +3939,7 @@ sub gst_network_ensure_loopback_interfac
|
|
|
7b9d9a9 |
"pld-1.0" => "lo",
|
|
|
7b9d9a9 |
"pld-1.1" => "lo",
|
|
|
7b9d9a9 |
"pld-1.99" => "lo",
|
|
|
7b9d9a9 |
- "fedora-1" => "",
|
|
|
7b9d9a9 |
- "fedora-2" => "",
|
|
|
7b9d9a9 |
- "fedora-3" => "",
|
|
|
7b9d9a9 |
+ "fedora" => "",
|
|
|
7b9d9a9 |
"yoper-2.1" => "",
|
|
|
7b9d9a9 |
"yoper-2.2" => "",
|
|
|
7b9d9a9 |
"specifix" => "",
|
|
|
7b9d9a9 |
@@ -4088,9 +4082,7 @@ sub gst_network_get_parse_table
|
|
|
7b9d9a9 |
"pld-1.0" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.1" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.99" => "pld-1.0",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-7.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-7.2",
|
|
|
7b9d9a9 |
"specifix" => "redhat-7.2",
|
|
|
7b9d9a9 |
@@ -4584,9 +4576,7 @@ sub gst_network_get_interface_parse_tabl
|
|
|
7b9d9a9 |
"pld-1.0" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.1" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.99" => "pld-1.0",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-7.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-7.2",
|
|
|
7b9d9a9 |
"specifix" => "redhat-7.2",
|
|
|
7b9d9a9 |
@@ -5475,9 +5465,7 @@ sub gst_network_get_replace_table
|
|
|
7b9d9a9 |
"pld-1.0" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.1" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.99" => "pld-1.0",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-7.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-7.2",
|
|
|
7b9d9a9 |
"specifix" => "redhat-7.2",
|
|
|
7b9d9a9 |
@@ -5921,9 +5909,7 @@ sub gst_network_get_interface_replace_ta
|
|
|
7b9d9a9 |
"pld-1.0" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.1" => "pld-1.0",
|
|
|
7b9d9a9 |
"pld-1.99" => "pld-1.0",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-7.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-7.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-7.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-7.2",
|
|
|
7b9d9a9 |
"specifix" => "redhat-7.2",
|
|
|
7b9d9a9 |
diff -up kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake
|
|
|
7b9d9a9 |
--- kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake.orig 2009-07-27 11:04:48.000000000 +0200
|
|
|
7b9d9a9 |
+++ kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake 2009-07-27 11:06:12.000000000 +0200
|
|
|
7b9d9a9 |
@@ -101,9 +101,7 @@ $PLATFORM_INFO = {
|
|
|
7b9d9a9 |
"pld-1.99" => "PLD 1.99 Ac-pre",
|
|
|
7b9d9a9 |
"vine-3.0" => "Vine Linux 3.0",
|
|
|
7b9d9a9 |
"vine-3.1" => "Vine Linux 3.1",
|
|
|
7b9d9a9 |
- "fedora-1" => "Fedora Core 1 (Yarrow)",
|
|
|
7b9d9a9 |
- "fedora-2" => "Fedora Core 2 (Tettnang)",
|
|
|
7b9d9a9 |
- "fedora-3" => "Fedora Core 3 (Heidelberg)",
|
|
|
7b9d9a9 |
+ "fedora" => "Fedora",
|
|
|
7b9d9a9 |
"yoper-2.1" => "Yoper Linux 2.1 (for i686)",
|
|
|
7b9d9a9 |
"yoper-2.2" => "Yoper Linux 2.2 (for i686)",
|
|
|
7b9d9a9 |
"specifix" => "Specifix Linux",
|
|
|
7b9d9a9 |
@@ -293,20 +291,7 @@ sub check_blackpanther
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
sub check_fedora
|
|
|
7b9d9a9 |
{
|
|
|
7b9d9a9 |
- open FEDORA, "$gst_prefix/etc/fedora-release" or return -1;
|
|
|
7b9d9a9 |
- while (<FEDORA>)
|
|
|
7b9d9a9 |
- {
|
|
|
7b9d9a9 |
- $ver = $_;
|
|
|
7b9d9a9 |
- chomp ($ver);
|
|
|
7b9d9a9 |
-
|
|
|
7b9d9a9 |
- if ($ver =~ /^Fedora Core release (\S+)/)
|
|
|
7b9d9a9 |
- {
|
|
|
7b9d9a9 |
- close FEDORA;
|
|
|
7b9d9a9 |
- return "fedora-$1";
|
|
|
7b9d9a9 |
- }
|
|
|
7b9d9a9 |
- }
|
|
|
7b9d9a9 |
-
|
|
|
7b9d9a9 |
- close FEDORA;
|
|
|
7b9d9a9 |
+ return "fedora" if stat ("$gst_prefix/etc/fedora-release");
|
|
|
7b9d9a9 |
return -1;
|
|
|
7b9d9a9 |
}
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
diff -up kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake
|
|
|
7b9d9a9 |
--- kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake.orig 2009-07-27 11:03:28.000000000 +0200
|
|
|
7b9d9a9 |
+++ kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake 2009-07-27 11:04:44.000000000 +0200
|
|
|
7b9d9a9 |
@@ -102,9 +102,7 @@ sub gst_service_sysv_get_paths
|
|
|
7b9d9a9 |
"pld-1.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
"pld-1.99" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
- "fedora-1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
- "fedora-2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
- "fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
+ "fedora" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
"yoper-2.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
"yoper-2.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
|
|
7b9d9a9 |
@@ -182,9 +180,7 @@ sub gst_service_sysv_get_runlevels
|
|
|
7b9d9a9 |
"pld-1.1" => [3, 5],
|
|
|
7b9d9a9 |
"pld-1.99" => [3, 5],
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
- "fedora-1" => [3, 5],
|
|
|
7b9d9a9 |
- "fedora-2" => [3, 5],
|
|
|
7b9d9a9 |
- "fedora-3" => [3, 5],
|
|
|
7b9d9a9 |
+ "fedora" => [3, 5],
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
"yoper-2.1" => [3, 5],
|
|
|
7b9d9a9 |
"yoper-2.2" => [3, 5],
|
|
|
7b9d9a9 |
@@ -262,9 +258,7 @@ sub gst_service_get_runlevel_roles
|
|
|
7b9d9a9 |
"pld-1.0" => "redhat-5.2",
|
|
|
7b9d9a9 |
"pld-1.1" => "redhat-5.2",
|
|
|
7b9d9a9 |
"pld-1.99" => "redhat-5.2",
|
|
|
7b9d9a9 |
- "fedora-1" => "redhat-5.2",
|
|
|
7b9d9a9 |
- "fedora-2" => "redhat-5.2",
|
|
|
7b9d9a9 |
- "fedora-3" => "redhat-5.2",
|
|
|
7b9d9a9 |
+ "fedora" => "redhat-5.2",
|
|
|
7b9d9a9 |
|
|
|
7b9d9a9 |
"yoper-2.1" => "redhat-5.2",
|
|
|
7b9d9a9 |
"yoper-2.2" => "redhat-5.2",
|
|
|
7b9d9a9 |
@@ -1625,9 +1619,7 @@ sub gst_service_get_status
|
|
|
7b9d9a9 |
"redhat-8.0" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
"redhat-9" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
"mandrake-7.2" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
- "fedora-1" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
- "fedora-2" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
- "fedora-3" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
+ "fedora" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
"yoper-2.1" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
"yoper-2.2" => \&gst_service_redhat_get_status,
|
|
|
7b9d9a9 |
"specifix" => \&gst_service_redhat_get_status,
|