[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r11398: Use knetworkmanager to manage VPN connections instead of kvp (in incognito/trunk: . arch/x86 portage.config portage.overlay/kde-misc/knetworkmanager portage.overlay/kde-misc/knetworkmanager/files portage.overlay/net-misc root_overlay/etc/init.d root_overlay/usr/share/applnk root_overlay/usr/share/incognito)
Author: double
Date: 2007-09-07 08:30:50 -0400 (Fri, 07 Sep 2007)
New Revision: 11398
Added:
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild
Removed:
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/ChangeLog
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-698665
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-698665.ebuild
incognito/trunk/portage.overlay/net-misc/kvpnc/
incognito/trunk/root_overlay/usr/share/applnk/kvpnc.desktop
Modified:
incognito/trunk/arch/x86/livecd-stage2.spec
incognito/trunk/fsscript.sh
incognito/trunk/portage.config/package.keywords
incognito/trunk/portage.config/package.use
incognito/trunk/portage.overlay/kde-misc/knetworkmanager/Manifest
incognito/trunk/root_overlay/etc/init.d/external-config-setup
incognito/trunk/root_overlay/usr/share/incognito/readme.html
Log:
Use knetworkmanager to manage VPN connections instead of kvpnc.
Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/arch/x86/livecd-stage2.spec 2007-09-07 12:30:50 UTC (rev 11398)
@@ -110,8 +110,6 @@
app-crypt/truecrypt
net-misc/networkmanager
kde-misc/knetworkmanager
- net-misc/vpnc
- net-misc/kvpnc
livecd/unmerge:
Modified: incognito/trunk/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/fsscript.sh 2007-09-07 12:30:50 UTC (rev 11398)
@@ -78,7 +78,7 @@
mkdir -p $USERDIR/.kde3.5/share/apps/konqueror
mv $USERDIR/.kde3.5/share/config/bookmarks.xml $USERDIR/.kde3.5/share/apps/konqueror/
- [[ -x /usr/bin/knetworkmanager ]] && ( mkdir -p $USERDIR/.kde3.5/Autostart ; ln -s /usr/bin/knetworkmanager $USERDIR/.kde3.5/Autostart )
+ [[ -x /usr/kde/3.5/bin/knetworkmanager ]] && ( mkdir -p $USERDIR/.kde3.5/Autostart ; ln -s /usr/kde/3.5/bin/knetworkmanager $USERDIR/.kde3.5/Autostart )
fi
# Fluxbox config
@@ -171,9 +171,6 @@
cat >>/etc/sudoers <<EOF
Defaults:%wheel !env_reset
-%wheel ALL=(ALL) NOPASSWD: /usr/bin/kvpnc
-
-Defaults:%wheel !env_reset
%wheel ALL=(ALL) NOPASSWD: /usr/sbin/create-usb
EOF
Modified: incognito/trunk/portage.config/package.keywords
===================================================================
--- incognito/trunk/portage.config/package.keywords 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/portage.config/package.keywords 2007-09-07 12:30:50 UTC (rev 11398)
@@ -56,6 +56,9 @@
# NetworkManager
net-misc/networkmanager ~*
+net-misc/networkmanager-pptp ~*
+net-misc/networkmanager-openvpn ~*
+net-misc/networkmanager-vpnc ~*
kde-misc/knetworkmanager ~*
dev-libs/libnl ~*
net-misc/dhcdbd ~*
Modified: incognito/trunk/portage.config/package.use
===================================================================
--- incognito/trunk/portage.config/package.use 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/portage.config/package.use 2007-09-07 12:30:50 UTC (rev 11398)
@@ -4,6 +4,7 @@
sys-libs/glibc glibc-omitfp
sys-libs/ncurses minimal
net-misc/networkmanager -gnome
+kde-misc/knetworkmanager cisco dialup openvpn pptp
net-www/mplayerplug-in divx gmedia realmedia wmp
# pt causes Firefox 2.0.0.3 to fail
Deleted: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/ChangeLog
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/ChangeLog 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/ChangeLog 2007-09-07 12:30:50 UTC (rev 11398)
@@ -1,22 +0,0 @@
-# ChangeLog for kde-misc/knetworkmanager
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 30 Jul 2007; <roderick_greening@xxxxxxxxxxx>
- +files/knetworkmanager-libnl_u64-fix.patch, knetworkmanager-9999.ebuild:
- Fixed live build for libnl problem (u64 definition)
-
- 06 Jun 2007; <roderick_greening@xxxxxxxxxxx> knetworkmanager-9999.ebuild:
- Updated knetworkmanager - moved from trunk to branch kde3
-
- 17 Mar 2007; <roderick_greening@xxxxxxxxxxx> knetworkmanager-9999.ebuild,
- +files/knetworkmanager-pam_console-fix.patch:
-
- 17 Mar 2007; <roderick_greening@xxxxxxxxxxx> knetworkmanager-9999.ebuild,
- +files/knetworkmanager-pam_console-fix.patch:
- Added post install warning.
- Fix to use group permissions plugdev rather than require pam console.
-
- 14 Mar 2007; Alex Heck <nesl247@xxxxxxxxx> +knetworkmanager-9999.ebuild:
- Initial import
-
Modified: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/Manifest
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/Manifest 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/Manifest 2007-09-07 12:30:50 UTC (rev 11398)
@@ -1,3 +1,23 @@
+AUX knetworkmanager-0.2-fix-desktop-icon.patch 426 RMD160 912bf45eef402b3cdc1e81a158b977bfb43e5382 SHA1 8a0674e9585ff848ad66b6129f9452a2e0d2ecd2 SHA256 aabaae9a1721af57a81eb1c9dafbba1590825e41e2b748188fe5f788f44946e0
+MD5 521d200981e8b16db49760b6bf0b6013 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
+RMD160 912bf45eef402b3cdc1e81a158b977bfb43e5382 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
+SHA256 aabaae9a1721af57a81eb1c9dafbba1590825e41e2b748188fe5f788f44946e0 files/knetworkmanager-0.2-fix-desktop-icon.patch 426
+AUX knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566 RMD160 27cd973efbb3a7755c21596da73b661d1c5deea7 SHA1 bd811d5a0e8a16b35d02fdd41ea76564c65a70c7 SHA256 44e6e0043a132daf43744c4853c1a436254bcdc30a52fd0434ae1919d9f112bd
+MD5 4944d32d86f22f4064fcc74feb635131 files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
+RMD160 27cd973efbb3a7755c21596da73b661d1c5deea7 files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
+SHA256 44e6e0043a132daf43744c4853c1a436254bcdc30a52fd0434ae1919d9f112bd files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 566
+AUX knetworkmanager-0.2-kppp.patch 1361 RMD160 a31b400698ee6b4b8f1b1b84da4168a88ffe88d8 SHA1 9ace96bc81639070e8198c1963fa1385837fbb92 SHA256 80279e19090287e98a4e4604a099018bb0dc068655d0ad3afcdae8415d13f95f
+MD5 c4ccedf6d7db94160341e9740806c487 files/knetworkmanager-0.2-kppp.patch 1361
+RMD160 a31b400698ee6b4b8f1b1b84da4168a88ffe88d8 files/knetworkmanager-0.2-kppp.patch 1361
+SHA256 80279e19090287e98a4e4604a099018bb0dc068655d0ad3afcdae8415d13f95f files/knetworkmanager-0.2-kppp.patch 1361
+AUX knetworkmanager-0.2-pam_console-fix.patch 1290 RMD160 cab71463e5e73b0a05eceb7cc6e98f2f3e2ecdf0 SHA1 3962ebf997fc9e63fe001061f25c4b6c024eab1a SHA256 7b1c8f6dadc18c7809f7bdb988b0085ea1ff63cdc61d1d0044f55f0b7ef738cb
+MD5 eee5d95e3ab443968379a29cdbbf5f4a files/knetworkmanager-0.2-pam_console-fix.patch 1290
+RMD160 cab71463e5e73b0a05eceb7cc6e98f2f3e2ecdf0 files/knetworkmanager-0.2-pam_console-fix.patch 1290
+SHA256 7b1c8f6dadc18c7809f7bdb988b0085ea1ff63cdc61d1d0044f55f0b7ef738cb files/knetworkmanager-0.2-pam_console-fix.patch 1290
+AUX knetworkmanager-0.2_p20070831-optional-dialup.patch 2171 RMD160 fc047c60090ed154c27579b5741396d1536f02ae SHA1 1db17926332451db6df7efcafe637e5193c0d485 SHA256 c1414df1efa2addb7310829a4c60112ffa619b7845acb8838894886ac70228d3
+MD5 63ea374b3f3566263b47a6985a1030fd files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
+RMD160 fc047c60090ed154c27579b5741396d1536f02ae files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
+SHA256 c1414df1efa2addb7310829a4c60112ffa619b7845acb8838894886ac70228d3 files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2171
AUX knetworkmanager-libnl_u64-fix.patch 965 RMD160 550dc14bce16767e3c7a45aa7aeb00bf21cf6378 SHA1 f27afb79163369f4199ac5c696f94bf857fa85bf SHA256 a3fcb33b86c92be36c2a8772330ac8adbdf1742ec19f2c8b871c177e0e7810a0
MD5 466a5a4ba8637566346bf3a27ef3d870 files/knetworkmanager-libnl_u64-fix.patch 965
RMD160 550dc14bce16767e3c7a45aa7aeb00bf21cf6378 files/knetworkmanager-libnl_u64-fix.patch 965
@@ -6,14 +26,13 @@
MD5 d887449b3d3861baa7932c57a710ee9d files/knetworkmanager-pam_console-fix.patch 550
RMD160 306fa85cb9b373f1ad041b673dc6140cc4f9bcac files/knetworkmanager-pam_console-fix.patch 550
SHA256 98a83231b9bc15ddadc9824c303d9a752dd92eba0b40cb31e81e16dde82a1779 files/knetworkmanager-pam_console-fix.patch 550
-EBUILD knetworkmanager-698665.ebuild 1840 RMD160 a502d1f294aee796b05499fa99d854b1b8caa523 SHA1 a1a529736c09be9706dac095400d6babecf10395 SHA256 394b992ef58b81b40d4f8370cf7e5abfcd26fb53fa3cc501c74225832b847631
-MD5 391e99b3ab42c3df7ddb1733aabfefaf knetworkmanager-698665.ebuild 1840
-RMD160 a502d1f294aee796b05499fa99d854b1b8caa523 knetworkmanager-698665.ebuild 1840
-SHA256 394b992ef58b81b40d4f8370cf7e5abfcd26fb53fa3cc501c74225832b847631 knetworkmanager-698665.ebuild 1840
-MISC ChangeLog 884 RMD160 af7cda683749dfbe36cf31589c2c9cd40f4af700 SHA1 3a973234e074a9bc71389b659b3ec502d0f41d74 SHA256 c78f9bf9cbc8ea24a6c8712606e58889d9f94dba002612838d171377cbc7c9f0
-MD5 02d4120cfa2c3eec98e1326ac2d08563 ChangeLog 884
-RMD160 af7cda683749dfbe36cf31589c2c9cd40f4af700 ChangeLog 884
-SHA256 c78f9bf9cbc8ea24a6c8712606e58889d9f94dba002612838d171377cbc7c9f0 ChangeLog 884
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-knetworkmanager-698665 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-knetworkmanager-698665 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-knetworkmanager-698665 0
+DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
+DIST knetworkmanager-0.2.tar.bz2 225228 RMD160 35d465d152254608d8777435f4b934197cab30f8 SHA1 ce36cab2306cd5a06ca7cd536196628f052e0c4a SHA256 d2fa5215913081301abf5f32603d19d4d66a4c8977c54184dfbdd011cbd5fe08
+DIST knetworkmanager-0.2_p20070831.patch.bz2 8735 RMD160 502baadf338bfde11b0853e9e7f180c1ddc84862 SHA1 6ecc23d40ec5c59b31d4446d7c04743648dd9ecb SHA256 8457bceaff742c769dca77867d6f7de734cff7c078c7e8761ac73c952ff95369
+EBUILD knetworkmanager-0.2_p20070831.ebuild 2117 RMD160 6bda244a169c3e36a3b8cbf4902fb5b5dcfe82c2 SHA1 b344276fa0191af23dc0bcc616dad0fd8c383a30 SHA256 bce332d27649124283e21bef5b1d17d8ca6baad6958dd23d95032470b1527cb4
+MD5 3a44dab45496e69f1acece9ca54a3324 knetworkmanager-0.2_p20070831.ebuild 2117
+RMD160 6bda244a169c3e36a3b8cbf4902fb5b5dcfe82c2 knetworkmanager-0.2_p20070831.ebuild 2117
+SHA256 bce332d27649124283e21bef5b1d17d8ca6baad6958dd23d95032470b1527cb4 knetworkmanager-0.2_p20070831.ebuild 2117
+MD5 3d18fde98000131fa23204334edcf63e files/digest-knetworkmanager-0.2_p20070831 813
+RMD160 5825c827eb7f507448159866d483029cc9235f15 files/digest-knetworkmanager-0.2_p20070831 813
+SHA256 0db9deade95a47d9abcba7cb7a8b5737acd9da49c86a13236a29fc18468f6d55 files/digest-knetworkmanager-0.2_p20070831 813
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831 (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-0.2_p20070831 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,9 @@
+MD5 0631502f50688142ae50da2cb136a422 kde-admindir-3.5.5.tar.bz2 187274
+RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed kde-admindir-3.5.5.tar.bz2 187274
+SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 kde-admindir-3.5.5.tar.bz2 187274
+MD5 9e1962bbc060e3dec806ff2463d2aec4 knetworkmanager-0.2.tar.bz2 225228
+RMD160 35d465d152254608d8777435f4b934197cab30f8 knetworkmanager-0.2.tar.bz2 225228
+SHA256 d2fa5215913081301abf5f32603d19d4d66a4c8977c54184dfbdd011cbd5fe08 knetworkmanager-0.2.tar.bz2 225228
+MD5 139da2009316d8ad00cd78de5bd5d199 knetworkmanager-0.2_p20070831.patch.bz2 8735
+RMD160 502baadf338bfde11b0853e9e7f180c1ddc84862 knetworkmanager-0.2_p20070831.patch.bz2 8735
+SHA256 8457bceaff742c769dca77867d6f7de734cff7c078c7e8761ac73c952ff95369 knetworkmanager-0.2_p20070831.patch.bz2 8735
Deleted: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/digest-knetworkmanager-698665
===================================================================
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fix-desktop-icon.patch 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,13 @@
+From suse
+
+--- ./knetworkmanager/src/knetworkmanager.desktop 2007/03/09 10:14:59 1.1
++++ ./knetworkmanager/src/knetworkmanager.desktop 2007/03/09 10:15:08
+@@ -6,7 +6,7 @@
+ GenericName[ja]=ネットワークマネージャ
+ GenericName[pt]=Gestor de Redes
+ Exec=knetworkmanager
+-Icon=network
++Icon=knetworkmanager
+ Type=Application
+ Comment=A KDE frontend for NetworkManager
+ Comment[da]=En KDE-grænseflade for Networkmanager
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-fixbuild_u64-hschaa-01.patch 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,15 @@
+From Suse.
+
+"This patch won't be submitted to the svn version as it is only an ugly workaround for issues caused by libnl's handling of kernel types (fixed in libnl trunk)."
+
+--- knetworkmanager/src/Makefile.am
++++ knetworkmanager/src/Makefile.am
+@@ -31,7 +31,7 @@
+ lib_LTLIBRARIES =
+ kdeinit_LTLIBRARIES = knetworkmanager.la
+
+-KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
++KDE_CXXFLAGS = -UQT_NO_ASCII_CAST -std=gnu++98
+
+ # the application source, library search path, and link libraries
+ knetworkmanager_la_SOURCES = main.cpp knetworkmanager.cpp knetworkmanager-dbus.cpp \
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-kppp.patch 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,30 @@
+Add Gentoo support for dial-up Dialog.
+
+Sent upstream: http://bugs.kde.org/148951
+
+Index: knetworkmanager-0.2/knetworkmanager/configure.in.in
+===================================================================
+--- knetworkmanager-0.2.orig/knetworkmanager/configure.in.in
++++ knetworkmanager-0.2/knetworkmanager/configure.in.in
+@@ -85,9 +85,10 @@ CPPFLAGS=$safe_CPPFLAGS
+ LIBS=$safe_LIBS
+ AC_LANG_RESTORE
+
+-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
++AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse,gentoo]))
+ if test "x$with_distro" = "x"; then
+ AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
++ AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+ if test "x$with_distro" = "x"; then
+ with_distro=`lsb_release -is`
+ fi
+@@ -102,6 +103,9 @@ else
+ suse)
+ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool])
+ ;;
++ gentoo)
++ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop ${KDEDIR}/bin/kppp", [Command to launch dial up configuration tool])
++ ;;
+ *)
+ echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
+ ;;
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2-pam_console-fix.patch 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,29 @@
+Name: knetworkmanager-pam_console-fix.patch
+URL: svn://svn.gentoo-xeffects.org/xeffects/trunk/kde-misc/knetworkmanager/files/knetworkmanager-pam_console-fix.patch
+Repository Root: svn://svn.gentoo-xeffects.org/xeffects
+Repository UUID: 293eb232-8020-0410-9bbe-a7a9c2f1b3fa
+
+Last Changed Author: roderick
+Last Changed Rev: 540
+Last Changed Date: 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007)
+
+------------------------------------------------------------------------
+r540 | roderick | 2007-03-17 22:17:12 +0100 (Sat, 17 Mar 2007) | 1 line
+
+Fix to use group permissions plugdev rather than require pam console.
+------------------------------------------------------------------------
+
+
+Index: knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
+===================================================================
+--- knetworkmanager-0.2.orig/knetworkmanager/knetworkmanager.conf
++++ knetworkmanager-0.2/knetworkmanager/knetworkmanager.conf
+@@ -8,7 +8,7 @@
+ <allow send_destination="org.freedesktop.NetworkManagerInfo"/>
+ <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
+ </policy>
+- <policy at_console="true">
++ <policy group="plugdev">
+ <allow own="org.freedesktop.NetworkManagerInfo"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerInfo"/>
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/files/knetworkmanager-0.2_p20070831-optional-dialup.patch 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,56 @@
+Index: configure.in.in
+===================================================================
+--- configure.in.in (revision 706976)
++++ configure.in.in (working copy)
+@@ -97,23 +97,34 @@
+
+ with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
+
+-if test "x$with_distro" = "x"; then
+- echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
+-else
+- case $with_distro in
+- suse)
+- AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool])
+- ;;
+- gentoo)
+- AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop ${KDEDIR}/bin/kppp", [Command to launch dial up configuration tool])
+- ;;
+- fedora)
+- AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool])
+- ;;
+- *)
+- echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
+- ;;
+- esac
++# Compile dialup support
++
++AC_ARG_WITH(dialup, AC_HELP_STRING([--with-dialup], [Build KNetworkManager with Dialup support (default)]))
++if test "x$with_dialup" != "xno"; then
++ if test "x$with_distro" = "x"; then
++ echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
++ else
++ case $with_distro in
++ suse)
++ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
++ "kdesu --nonewdcop /sbin/yast2 modem",
++ [Command to launch dial up configuration tool])
++ ;;
++ gentoo)
++ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
++ "kdesu --nonewdcop ${KDEDIR}/bin/kppp",
++ [Command to launch dial up configuration tool])
++ ;;
++ fedora)
++ AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
++ "kdesu --nonewdcop /usr/bin/kppp",
++ [Command to launch dial up configuration tool])
++ ;;
++ *)
++ echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
++ ;;
++ esac
++ fi
+ fi
+
+ # openvpn support
Added: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild (rev 0)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild 2007-09-07 12:30:50 UTC (rev 11398)
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-0.2_p20070831.ebuild,v 1.1 2007/08/31 18:38:43 rbu Exp $
+
+inherit kde eutils
+
+MY_P=${PN}-0.2
+
+DESCRIPTION="A KDE frontend for NetworkManager"
+HOMEPAGE="http://en.opensuse.org/Projects/KNetworkManager";
+LICENSE="GPL-2"
+SRC_URI="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/network/${MY_P}.tar.bz2
+ mirror://gentoo/${P}.patch.bz2
+ mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cisco openvpn pptp dialup"
+
+DEPEND="net-misc/networkmanager
+ >=kde-base/kdelibs-3.2
+ >=dev-libs/dbus-qt3-old-0.70
+ sys-apps/hal
+ net-wireless/wireless-tools
+ dev-libs/libnl
+ cisco? ( <net-misc/networkmanager-vpnc-0.7.0 )
+ openvpn? ( <net-misc/networkmanager-openvpn-0.3.3 )
+ pptp? ( <net-misc/networkmanager-pptp-0.7.0 )
+ dialup? ( || ( kde-base/kppp kde-base/kdenetwork ) )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ kde_pkg_setup
+
+ if has_version "<sys-apps/dbus-0.9*" && ! built_with_use sys-apps/dbus qt3 ; then
+ echo
+ eerror "You must rebuild sys-apps/dbus with USE=\"qt3\" or use a newer version of dbus"
+ die "sys-apps/dbus not built with qt3 bindings"
+ fi
+}
+
+src_unpack() {
+ kde_src_unpack
+ ln -s "${WORKDIR}/admin" "${S}/admin"
+ cd "${S}"
+
+ #epatch "${FILESDIR}/${MY_P}-kppp.patch"
+ epatch "${FILESDIR}/${MY_P}-pam_console-fix.patch"
+ epatch "${FILESDIR}/${MY_P}-fix-desktop-icon.patch"
+ epatch "${FILESDIR}/${MY_P}-fixbuild_u64-hschaa-01.patch"
+
+ cd knetworkmanager
+ epatch "${WORKDIR}/${P}.patch"
+ epatch "${FILESDIR}/${P}-optional-dialup.patch"
+}
+
+src_compile() {
+ set-kdedir
+ export PREFIX="${KDEDIR}"
+ local myconf="$(use_with cisco vpnc) \
+ $(use_with openvpn) \
+ $(use_with pptp) \
+ $(use_with dialup) \
+ --with-distro=gentoo --disable-rpath"
+ kde_src_compile
+}
+
+src_install() {
+ kde_src_install
+
+ # kde.eclass sets sysconfdir too weird for us, delete conf from there and reinstall to /etc
+ set-kdedir
+ rm -rf "${D}/${KDEDIR}/etc"
+ insinto /etc/dbus-1/system.d/
+ doins knetworkmanager/knetworkmanager.conf
+}
Deleted: incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-698665.ebuild
===================================================================
--- incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-698665.ebuild 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/portage.overlay/kde-misc/knetworkmanager/knetworkmanager-698665.ebuild 2007-09-07 12:30:50 UTC (rev 11398)
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit subversion kde
-
-ESVN_REPO_URI="svn://websvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager"
-ESVN_OPTIONS="-r ${PV}"
-
-DESCRIPTION="A NetworkManager front-end for KDE"
-HOMEPAGE="http://en.opensuse.org/Projects/KNetworkManager";
-LICENSE="GPL-2"
-SRC_URI=""
-KEYWORDS="~x86"
-
-DEPEND="net-misc/networkmanager
- >=kde-base/kdelibs-3.2
- || ( >=dev-libs/dbus-qt3-old-0.70 ( =sys-apps/dbus-0.62-r1 ) )
- sys-apps/hal"
-
-#S="${WORKDIR}/${PN}-${PV##*_p}"
-
-pkg_setup() {
- kde_pkg_setup
-
- if has_version "<sys-apps/dbus-0.9*" && ! built_with_use sys-apps/dbus qt3 ; then
- echo
- eerror "You must rebuild sys-apps/dbus with USE=\"qt3\""
- die "sys-apps/dbus not built with qt3 bindings"
- fi
-}
-
-src_unpack() {
- ewarn "This ebuild checks out several svn repositories."
- ewarn "This may take a while."
-
- OLD_S="${S}"
- # Set the original uri to a temp var
- ESVN_REPO_URI1=${ESVN_REPO_URI}
- ESVN_OPTIONS1="${ESVN_OPTIONS}"
-
- # Checkout kdereview
- ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/kdereview"
- ESVN_OPTIONS="-N -r ${PV}"
- subversion_src_unpack
-
- # Checkout admin
- ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin"
- ESVN_OPTIONS="-r ${PV}"
- S="${S}/admin"
- subversion_src_unpack
-
- # Checkout knetworkmanager
- ESVN_REPO_URI=${ESVN_REPO_URI1}
- ESVN_OPTIONS="${ESVN_OPTIONS1}"
- S="${S}/../${PN}"
- subversion_src_unpack
-
- S="${OLD_S}"
-
- epatch "${FILESDIR}/knetworkmanager-pam_console-fix.patch"
- epatch "${FILESDIR}/knetworkmanager-libnl_u64-fix.patch"
-}
-
-pkg_postinst() {
- kde_pkg_postinst
- echo
- ewarn "DO NOT report bugs to Gentoo's bugzilla"
- einfo "Please report all bugs to http://trac.gentoo-xeffects.org";
- einfo "Thank you on behalf of the Gentoo Xeffects team"
-}
-
Modified: incognito/trunk/root_overlay/etc/init.d/external-config-setup
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-config-setup 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/root_overlay/etc/init.d/external-config-setup 2007-09-07 12:30:50 UTC (rev 11398)
@@ -34,6 +34,13 @@
echo "user_pref(\"general.useragent.locale\", \"${X}\");" >> "${PREFS}"
done
+ KXKBRC="/home/gentoo/.kde3.5/share/config/kxkbrc"
+ if [[ -w "${KXKBRC}" ]]; then
+ sed -i "s:=${X},\?:=:" "${KXKBRC}"
+ sed -i "s:,${X}::" "${KXKBRC}"
+ sed -i "s:LayoutList=:LayoutList=${X},:" "${KXKBRC}"
+ fi
+
eend 0
fi
if [[ "${A}" == "keymap" && -n "${X}" && ! -e "/etc/sysconfig/keyboard" ]]; then
@@ -110,7 +117,6 @@
ebegin "Copying user config from boot media to /home/gentoo"
mkdir -p /home/gentoo/.kde3.5/share/config
[[ -f ${MEDIAROOT}/config/kopeterc ]] && cp ${MEDIAROOT}/config/kopeterc /home/gentoo/.kde3.5/share/config
- [[ -f ${MEDIAROOT}/config/kvpncrc ]] && cp ${MEDIAROOT}/config/kvpncrc /home/gentoo/.kde3.5/share/config
if [[ -d ${MEDIAROOT}/keys/ssh ]]; then
cp -a ${MEDIAROOT}/keys/ssh /home/gentoo/.ssh
chown -R gentoo:users /home/gentoo/.ssh
@@ -130,7 +136,6 @@
for USERDIR in /home/*; do
chown -R ${USERDIR/\/home\//}:users $USERDIR
find $USERDIR -type f -print0 | xargs -0 chmod u+rw
- [[ -f $USERDIR/.kde3.5/share/config/kvpncrc ]] && chown root:root $USERDIR/.kde3.5/share/config/kvpncrc
done
eend 0
fi
Deleted: incognito/trunk/root_overlay/usr/share/applnk/kvpnc.desktop
===================================================================
--- incognito/trunk/root_overlay/usr/share/applnk/kvpnc.desktop 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/root_overlay/usr/share/applnk/kvpnc.desktop 2007-09-07 12:30:50 UTC (rev 11398)
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment=GUI for various VPN clients
-Comment[es]=Interfaces para varios clientes VPN
-Comment[de]=Oberfläche für VPN-Clients
-Comment[pt]=Interface para vários clientes de VPNs
-Comment[sv]=Grafiskt gränssnitt för diverse VPN-klienter
-Comment[xx]=xxGUI for various VPN clientsxx
-
-Name=KVpnc
-Name[xx]=xxKVpncxx
-
-GenericName=VPN Client GUI
-GenericName[es]=Interfaz del cliente VPN
-GenericName[de]=VPN-Client-GUI
-GenericName[pt]=GUI de Cliente de VPN
-GenericName[sv]=Grafiskt gränssnitt för VPN-klienter
-GenericName[xx]=xxVPN Client GUIxx
-
-Categories=Network;RemoteAccess;KDE;Qt
-Exec=sudo /usr/bin/kvpnc
-X-KDE-SubstituteUID=false
-Icon=kvpnc
-Type=Application
-
-Version=0.9.4
-
Modified: incognito/trunk/root_overlay/usr/share/incognito/readme.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/readme.html 2007-09-07 12:27:20 UTC (rev 11397)
+++ incognito/trunk/root_overlay/usr/share/incognito/readme.html 2007-09-07 12:30:50 UTC (rev 11398)
@@ -252,9 +252,6 @@
<dt><a href="<!-- #homepage(net-misc/vpnc) -->">vpnc</a> <!-- #version(net-misc/vpnc) --></dt>
<dd><!-- #description(net-misc/vpnc) --></dd>
-<dt><a href="<!-- #homepage(net-misc/kvpnc) -->">KDE - kvpnc</a> <!-- #version(net-misc/kvpnc) --></dt>
-<dd><!-- #description(net-misc/kvpnc) --></dd>
-
<dt><a href="<!-- #homepage(net-misc/netkit-telnetd) -->">telnet</a> <!-- #version(net-misc/netkit-telnetd) --></dt>
<dd><!-- #description(net-misc/netkit-telnetd) --></dd>
@@ -449,7 +446,6 @@
<tr><th>Software</th><th>USB drive location</th><th>Destination</th></tr>
<tr><td>OpenVPN</td><td>/keys/openvpn</td><td>/etc/openvpn</td>
<tr><td colspan="3">The following are only copied if a persistent home cannot be created.</td></tr>
-<tr><td>kvpnc (KDE VPN controller)</td><td>/config/kvpncrc</td><td>/home/gentoo/.kde3.5/share/config</td>
<tr><td>Kopete</td><td>/config/kopeterc</td><td>/home/gentoo/.kde3.5/share/config</td>
<tr><td>SSH</td><td>/keys/ssh</td><td>/home/gentoo/.ssh</td>
</table>