[Pkg-kde-commits] rev 1883 - in branches/kde-3.4.0/packages/kdenetwork/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-29 14:23:36 +0000 (Thu, 29 Sep 2005)
New Revision: 1883

Added:
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/17_kppp_devices.diff
Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian
Log:
More kppp modem /dev/nodes. Should save users a lot of trouble.


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-28 21:45:23 UTC (rev 1882)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-29 14:23:36 UTC (rev 1883)
@@ -1,3 +1,13 @@
+kdenetwork (4:3.4.2-4) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which expands the device nodes that KPPP accepts by default.
+    This should reduce the number of symlinks to /dev/modem which users need
+    to create.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdenetwork (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian	2005-09-28 21:45:23 UTC (rev 1882)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian	2005-09-29 14:23:36 UTC (rev 1883)
@@ -4,7 +4,9 @@
 In order to use KPPP, you must first be a member of the "dip" group.
 Membership in this group is a prerequisite for any and all use of ppp in
 Debian. If you are not a member of this group, you will not be able to run
-the ppp daemon (pppd) or make a dialup connection.
+the ppp daemon (pppd) or make a dialup connection. Since KPPP's backend
+runs SUID root, membership in the "dialout" group is not needed to access
+device nodes.
 
 KPPP also requires that the ppp daemon be run with the "noauth" option.
 However, pppd's default setting, in /etc/ppp/options, is "auth", and for
@@ -31,3 +33,8 @@
 across reboots. In this case, you should edit, as root, /etc/udev/links.conf,
 adding a line that resembles "L modem    /dev/ttyS28". You must then either
 reboot, or run "/etc/init.d/udev restart", for the link to be created.
+
+If you believe that your modem node should be included in KPPP's default list,
+and you are using a common type of hardware, you can always file a wishlist
+bug against the kppp package, although the package maintainers maintain the
+right to judge your device node too esoteric for inclusion.

Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/17_kppp_devices.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/17_kppp_devices.diff	2005-09-28 21:45:23 UTC (rev 1882)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/17_kppp_devices.diff	2005-09-29 14:23:36 UTC (rev 1883)
@@ -0,0 +1,96 @@
+--- kde.orig/kppp/devices.h
++++ kde.patched/kppp/devices.h
+@@ -37,37 +37,62 @@
+   "/dev/dtyU3",
+ #elif defined (__linux__)
+   "/dev/modem",
++  "/dev/modem0",
++  "/dev/modem1",
++  "/dev/modem2",
++  "/dev/modem3",
+   "/dev/ttyS0",
+   "/dev/ttyS1",
+   "/dev/ttyS2",
+   "/dev/ttyS3",
+   "/dev/ttyS4",
+-#ifdef ISDNSUPPORT
+-  "/dev/ttyI0",
+-  "/dev/ttyI1",
+-  "/dev/ttyI2",
+-  "/dev/ttyI3",
+-#endif
++  "/dev/ttyS5",
++  "/dev/ttyS6",
++  "/dev/ttyS7",
++  "/dev/ttyS8",
++  "/dev/ttyS9",
++  "/dev/ttyS10",
++  "/dev/ttyS11",
++  "/dev/ttyS12",
++  "/dev/ttyS13",
++  "/dev/ttyS14",
++  "/dev/ttyS15",
++  "/dev/ttyS16",
++  "/dev/ttyS17",
++  "/dev/slamr",
++  "/dev/slamr0",
++  "/dev/slamr1",
++  "/dev/slamr2",
++  "/dev/slamr3",
++  "/dev/slusb",
++  "/dev/slusb0",
++  "/dev/slusb1",
++  "/dev/slusb2",
++  "/dev/slusb3",
++  "/dev/ttyACM0",
++  "/dev/ttyACM1",
++  "/dev/ttyACM2",
++  "/dev/ttyACM3",
+   "/dev/usb/ttyACM0",          /* USB stuff modems */
+   "/dev/usb/ttyACM1",
+   "/dev/usb/ttyACM2",
+   "/dev/usb/ttyACM3",
++  "/dev/ttyUSB0",          /* USB stuff modems  with udev */
++  "/dev/ttyUSB1",
++  "/dev/ttyUSB2",
++  "/dev/ttyUSB3",
+   "/dev/usb/ttyUSB0",          /* USB stuff modems */
+   "/dev/usb/ttyUSB1",
+   "/dev/usb/ttyUSB2",
+   "/dev/usb/ttyUSB3",
+-  "/dev/ttyUSB0",          /* USB stuff modems  with udev */
+-  "/dev/ttyUSB1",
+-  "/dev/ttyUSB2",
+-  "/dev/ttyUSB3",  
+-  "/dev/usb/tts/0",          /* USB stuff modems with devfs*/
+-  "/dev/usb/tts/1",
+-  "/dev/usb/tts/2",
+-  "/dev/usb/tts/3",
+   "/dev/rfcomm0",	       /* BlueTooth */
+   "/dev/rfcomm1",
+   "/dev/rfcomm2",
+   "/dev/rfcomm3",
++  "/dev/bluetooth/rfcomm/0",
++  "/dev/bluetooth/rfcomm/1",
++  "/dev/bluetooth/rfcomm/2",
++  "/dev/bluetooth/rfcomm/3",
+   "/dev/ircomm0",	       /* IrDA */
+   "/dev/ircomm1",
+   "/dev/ircomm2",
+@@ -80,6 +105,16 @@
+   "/dev/ttySHSF1",
+   "/dev/ttySHSF2",
+   "/dev/ttySHSF3",  /* necessary for conexant modem which use hsfserial commercial module */
++  "/dev/ttySLT0",   /* Lucent winmodem devices */
++  "/dev/ttySLT1",
++  "/dev/ttySLT2",
++  "/dev/ttySLT3",
++#ifdef ISDNSUPPORT
++  "/dev/ttyI0",
++  "/dev/ttyI1",
++  "/dev/ttyI2",
++  "/dev/ttyI3",
++#endif
+ #elif defined(__svr4__)
+   "/dev/cua/a",
+   "/dev/cua/b",