Update KDE4 admin package.

This commit is contained in:
zhuk 2013-04-24 19:30:57 +00:00
parent 75e82732e1
commit 5c4baedc78
13 changed files with 209 additions and 105 deletions

View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.8 2010/11/22 08:37:02 espie Exp $
# $OpenBSD: Makefile,v 1.9 2013/04/24 19:30:57 zhuk Exp $
COMMENT = K Desktop Environment, admin tools
DISTNAME = kdeadmin-${VERSION}
COMMENT = KDE local system administration tools
DISTNAME = kdeadmin-${MODKDE4_VERSION}
LIB_DEPENDS += x11/kde4/libs \
x11/kde4/pimlibs
# these come from libs in real case
pre-install:
mkdir -p ${PREFIX}/share/doc/HTML/en/common
# From configure:
# -- rpm and deb file plugins necessary in system != UNIX ?
# -- PORT kfile plugins!!!
#
# TODO: ksystemlog: adapt "kernel" mode to OpenBSD.
WANTLIB = c m pthread stdc++
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg
WANTLIB += lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio ${KDE4LIB}/kldap ${KDE4LIB}/kntlm
WANTLIB += c kde3support kdecore>=8 kdeui kio kldap kntlm lib/qt4/Qt3Support \
lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg \
lib/qt4/QtXml m pthread stdc++
MODKDE4_USE = pim
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (kde/kdeadmin-4.4.5.tar.bz2) = aV38jCKzT6mRSo5r7HzK/A==
RMD160 (kde/kdeadmin-4.4.5.tar.bz2) = H5Cp1maL7QFcqm/2sQK8W44T2dQ=
SHA1 (kde/kdeadmin-4.4.5.tar.bz2) = udgLXbfbzQBQNoigL6zOgfL8BEI=
SHA256 (kde/kdeadmin-4.4.5.tar.bz2) = nocjfw0q9b9Y7McakNVFHpI76PjFEtZ9b1iyeaXcsso=
SIZE (kde/kdeadmin-4.4.5.tar.bz2) = 1430987
SHA256 (kde/kdeadmin-4.10.2.tar.xz) = IS+06jSc910CIXlwzJr6evTRgeOsHNfDSm8ggJ4IxKg=
SIZE (kde/kdeadmin-4.10.2.tar.xz) = 676368

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ksystemlog_src_lib_globals_cpp,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/lib/globals.cpp.orig Fri Nov 4 13:55:37 2011
+++ ksystemlog/src/lib/globals.cpp Fri Nov 4 13:55:48 2011
@@ -125,7 +125,7 @@ void Globals::setupLogModes() {
d->cupsAccessMode=new LogMode("cupsAccessLogMode", i18n("CUPS Access Log"), CUPS_ACCESS_MODE_ICON);
d->logModes.append(d->cupsAccessMode);
- d->postfixMode=new LogMode("postfixLogMode", i18n("Postfix Log"), POSTFIX_MODE_ICON);
+ d->postfixMode=new LogMode("postfixLogMode", i18n("Mail Log"), POSTFIX_MODE_ICON);
d->logModes.append(d->postfixMode);
}

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-ksystemlog_src_modes_apache_apacheConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/apache/apacheConfiguration.h.orig Mon Sep 27 23:52:09 2010
+++ ksystemlog/src/modes/apache/apacheConfiguration.h Fri Nov 4 02:50:32 2011
@@ -51,11 +51,21 @@ class ApacheConfiguration : public LogModeConfiguratio
configuration->setCurrentGroup(QLatin1String( "ApacheLogMode" ));
QStringList defaultApachePaths;
+#if defined(__OpenBSD__)
+ defaultApachePaths << QLatin1String( "/var/apache2/logs/error_log" );
+ defaultApachePaths << QLatin1String( "/var/www/logs/error_log" );
+#else
defaultApachePaths << QLatin1String( "/var/log/apache2/error.log" );
+#endif
configuration->addItemStringList(QLatin1String( "ApacheLogFilesPaths" ), d->apachePaths, defaultApachePaths, QLatin1String( "ApacheLogFilesPaths" ));
QStringList defaultApacheAccessPaths;
+#if defined(__OpenBSD__)
+ defaultApacheAccessPaths << QLatin1String( "/var/apache2/logs/access_log" );
+ defaultApacheAccessPaths << QLatin1String( "/var/www/logs/access_log" );
+#else
defaultApacheAccessPaths << QLatin1String( "/var/log/apache2/access.log" );
+#endif
configuration->addItemStringList(QLatin1String( "ApacheAccessLogFilesPaths" ), d->apacheAccessPaths, defaultApacheAccessPaths, QLatin1String( "ApacheAccessLogFilesPaths" ));
}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ksystemlog_src_modes_authentication_authenticationConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/authentication/authenticationConfiguration.h.orig Mon Sep 27 23:52:08 2010
+++ ksystemlog/src/modes/authentication/authenticationConfiguration.h Fri Nov 4 02:36:32 2011
@@ -51,7 +51,11 @@ class AuthenticationConfiguration : public LogModeConf
configuration->setCurrentGroup(QLatin1String( "AuthenticationLogMode" ));
+#if defined(__OpenBSD__)
+ QString defaultAuthenticationPath(QLatin1String( "/var/log/authlog" ));
+#else
QString defaultAuthenticationPath(QLatin1String( "/var/log/auth.log" ));
+#endif
configuration->addItemString(QLatin1String( "LogFilePath" ), d->authenticationPath, defaultAuthenticationPath, QLatin1String( "LogFilePath" ));
QStringList defaultWarningKeywords;

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-ksystemlog_src_modes_cron_cronConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/cron/cronConfiguration.h.orig Mon Sep 27 23:52:09 2010
+++ ksystemlog/src/modes/cron/cronConfiguration.h Fri Nov 4 02:45:02 2011
@@ -51,13 +51,17 @@ class CronConfiguration : public LogModeConfiguration
configuration->setCurrentGroup(QLatin1String( "CronLogMode" ));
QStringList defaultCronPaths;
+#if defined(__OpenBSD__)
+ defaultCronPaths << QLatin1String( "/var/cron/log" );
+#else
defaultCronPaths << QLatin1String( "/var/log/syslog" );
+#endif
configuration->addItemStringList(QLatin1String( "LogFilesPaths" ), d->cronPaths, defaultCronPaths, QLatin1String( "LogFilesPaths" ));
+#if !defined(__OpenBSD__)
QString defaultProcessFilter(QLatin1String( "/usr/sbin/cron" ));
configuration->addItemString(QLatin1String( "ProcessFilter" ), d->processFilter, defaultProcessFilter, QLatin1String( "ProcessFilter" ));
-
-
+#endif
}
virtual ~CronConfiguration() {

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ksystemlog_src_modes_daemon_daemonConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/daemon/daemonConfiguration.h.orig Mon Sep 27 23:52:09 2010
+++ ksystemlog/src/modes/daemon/daemonConfiguration.h Fri Nov 4 02:46:09 2011
@@ -47,7 +47,11 @@ class DaemonConfiguration : public LogModeConfiguratio
configuration->setCurrentGroup(QLatin1String( "DaemonLogMode" ));
QStringList defaultDaemonPaths;
+#if defined(__OpenBSD__)
+ defaultDaemonPaths << QLatin1String( "/var/log/daemon" );
+#else
defaultDaemonPaths << QLatin1String( "/var/log/daemon.log" );
+#endif
configuration->addItemStringList(QLatin1String( "LogFilesPaths" ), d->daemonPaths, defaultDaemonPaths, QLatin1String( "LogFilesPaths" ));
}

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-ksystemlog_src_modes_postfix_postfixConfigurationWidget_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/postfix/postfixConfigurationWidget.h.orig Fri Nov 4 13:58:24 2011
+++ ksystemlog/src/modes/postfix/postfixConfigurationWidget.h Fri Nov 4 13:58:50 2011
@@ -45,13 +45,13 @@ class PostfixConfigurationWidget : public LogModeConfi
public:
PostfixConfigurationWidget() :
- LogModeConfigurationWidget(i18n("Postfix Log"),QLatin1String( POSTFIX_MODE_ICON ), i18n("Postfix Log"))
+ LogModeConfigurationWidget(i18n("Mail Log"),QLatin1String( POSTFIX_MODE_ICON ), i18n("Mail Log"))
{
QVBoxLayout* layout = new QVBoxLayout();
this->setLayout(layout);
- QString description = i18n("<p>These files will be analyzed to show the <b>Postfix Logs</b>.</p>");
+ QString description = i18n("<p>These files will be analyzed to show the <b>Mail Logs</b>.</p>");
fileList = new LogLevelFileList(this, description);
@@ -67,11 +67,11 @@ class PostfixConfigurationWidget : public LogModeConfi
bool isValid() const {
if (fileList->isEmpty() == false) {
- logDebug() << "Postfix configuration valid" << endl;
+ logDebug() << "Mail configuration valid" << endl;
return true;
}
- logDebug() << "Postfix configuration not valid" << endl;
+ logDebug() << "Mail configuration not valid" << endl;
return false;
}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ksystemlog_src_modes_postfix_postfixConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/postfix/postfixConfiguration.h.orig Mon Sep 27 23:52:10 2010
+++ ksystemlog/src/modes/postfix/postfixConfiguration.h Fri Nov 4 02:47:54 2011
@@ -39,8 +39,13 @@ class PostfixConfiguration : public GenericLogModeConf
PostfixConfiguration() :
GenericLogModeConfiguration(
QLatin1String( POSTFIX_LOG_MODE_ID ),
+#if defined(__OpenBSD__)
+ QStringList() << QLatin1String( "/var/log/maillog" ),
+ QList<int>() << INFORMATION_LOG_LEVEL_ID
+#else
QStringList() << QLatin1String( "/var/log/mail.log" ) << QLatin1String( "/var/log/mail.info" ) << QLatin1String( "/var/log/mail.warn" ) << QLatin1String( "/var/log/mail.err" ),
QList<int>() << NOTICE_LOG_LEVEL_ID << INFORMATION_LOG_LEVEL_ID << WARNING_LOG_LEVEL_ID << ERROR_LOG_LEVEL_ID
+#endif
) {
}

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-ksystemlog_src_modes_postfix_postfixLogMode_cpp,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/postfix/postfixLogMode.cpp.orig Fri Nov 4 02:59:19 2011
+++ ksystemlog/src/modes/postfix/postfixLogMode.cpp Fri Nov 4 03:02:06 2011
@@ -36,7 +36,7 @@
#include "logModeItemBuilder.h"
PostfixLogMode::PostfixLogMode() :
- LogMode(QLatin1String( POSTFIX_LOG_MODE_ID ), i18n("Postfix Log"),QLatin1String( POSTFIX_MODE_ICON )) {
+ LogMode(QLatin1String( POSTFIX_LOG_MODE_ID ), i18n("Mail Log"),QLatin1String( POSTFIX_MODE_ICON )) {
d->logModeConfiguration = new PostfixConfiguration();
@@ -45,8 +45,8 @@ PostfixLogMode::PostfixLogMode() :
d->itemBuilder = new LogModeItemBuilder();
d->action = createDefaultAction();
- d->action->setToolTip(i18n("Display the Postfix log."));
- d->action->setWhatsThis(i18n("Displays the Postfix log in the current tab. Postfix is the most known and used mail server in the Linux world."));
+ d->action->setToolTip(i18n("Display mail log."));
+ d->action->setWhatsThis(i18n("Displays summary log of mail daemons in the current tab."));
}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-ksystemlog_src_modes_system_systemConfiguration_h,v 1.1 2013/04/24 19:30:57 zhuk Exp $
--- ksystemlog/src/modes/system/systemConfiguration.h.orig Mon Sep 27 23:52:09 2010
+++ ksystemlog/src/modes/system/systemConfiguration.h Fri Nov 4 02:49:06 2011
@@ -39,7 +39,11 @@ class SystemConfiguration : public GenericLogModeConfi
SystemConfiguration() :
GenericLogModeConfiguration(
QLatin1String( SYSTEM_LOG_MODE_ID ),
+#if defined(__OpenBSD__)
+ QStringList() << QLatin1String( "/var/log/messages" ),
+#else
QStringList() << QLatin1String( "/var/log/syslog" ),
+#endif
QList<int>() << INFORMATION_LOG_LEVEL_ID
) {

View File

@ -4,16 +4,13 @@ administrator might need:
* kcron
Editor for the cron command scheduler.
* kfile-plugins
Make Konquerer display additional info on about *.dep and *.rpm files.
* kpackage
Manager for DEB, RPM and similar software packages.
* kuser
An user manager.
System users/groups account manager.
* secpolicy
A program to display PAM security policies.
* ksystemlog
System log files monitoring and analyze tool.
* system-config-printer-kde
KDE GUI for system-config-printer service.
Most of this stuff will be useless/non-working on OpenBSD, actually.

View File

@ -1,76 +1,23 @@
@comment $OpenBSD: PLIST,v 1.5 2010/06/22 23:31:55 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2013/04/24 19:30:57 zhuk Exp $
@bin bin/ksystemlog
@bin bin/kuser
lib/kde4/kcm_cron.so
lib/kde4/kcm_knetworkconfmodule.so
share/applications/
share/applications/kde4/
share/applications/kde4/ksystemlog.desktop
share/applications/kde4/kuser.desktop
share/apps/knetworkconf/
share/apps/knetworkconf/backends/
share/apps/knetworkconf/backends/debug.pl
share/apps/knetworkconf/backends/file.pl
share/apps/knetworkconf/backends/general.pl
share/apps/knetworkconf/backends/network-conf
share/apps/knetworkconf/backends/network.pl
share/apps/knetworkconf/backends/parse.pl
share/apps/knetworkconf/backends/platform.pl
share/apps/knetworkconf/backends/process.pl
share/apps/knetworkconf/backends/replace.pl
share/apps/knetworkconf/backends/report.pl
share/apps/knetworkconf/backends/service-list.pl
share/apps/knetworkconf/backends/service.pl
share/apps/knetworkconf/backends/util.pl
share/apps/knetworkconf/backends/xml.pl
share/apps/knetworkconf/pixmaps/
share/apps/knetworkconf/pixmaps/ark.png
share/apps/knetworkconf/pixmaps/blackpanther.png
share/apps/knetworkconf/pixmaps/conectiva.png
share/apps/knetworkconf/pixmaps/debian.png
share/apps/knetworkconf/pixmaps/fedora.png
share/apps/knetworkconf/pixmaps/freebsd.png
share/apps/knetworkconf/pixmaps/gentoo.png
share/apps/knetworkconf/pixmaps/kubuntu.png
share/apps/knetworkconf/pixmaps/mandriva.png
share/apps/knetworkconf/pixmaps/openna.png
share/apps/knetworkconf/pixmaps/pld.png
share/apps/knetworkconf/pixmaps/redhat.png
share/apps/knetworkconf/pixmaps/slackware.png
share/apps/knetworkconf/pixmaps/specifix.png
share/apps/knetworkconf/pixmaps/suse.png
share/apps/knetworkconf/pixmaps/turbolinux.png
share/apps/knetworkconf/pixmaps/vine.png
share/apps/knetworkconf/pixmaps/yoper.png
share/apps/ksystemlog/
share/apps/ksystemlog/ksystemlogui.rc
share/apps/kuser/
share/apps/kuser/icons/
share/apps/kuser/icons/oxygen/
share/apps/kuser/icons/oxygen/22x22/
share/apps/kuser/icons/oxygen/22x22/actions/
share/apps/kuser/icons/oxygen/22x22/actions/user-group-delete.png
share/apps/kuser/icons/oxygen/22x22/actions/user-group-properties.png
share/apps/kuser/icons/hicolor/
share/apps/kuser/icons/hicolor/22x22/
share/apps/kuser/icons/hicolor/22x22/actions/
share/apps/kuser/icons/hicolor/22x22/actions/user-group-delete.png
share/apps/kuser/icons/hicolor/22x22/actions/user-group-properties.png
share/apps/kuser/kuserui.rc
share/apps/kuser/pics/
share/apps/kuser/pics/group.png
share/apps/kuser/pics/user.png
share/config.kcfg/kuser.kcfg
share/doc/HTML/en/kcontrol/knetworkconf/
share/doc/HTML/en/kcontrol/knetworkconf/01.png
share/doc/HTML/en/kcontrol/knetworkconf/02.png
share/doc/HTML/en/kcontrol/knetworkconf/03.png
share/doc/HTML/en/kcontrol/knetworkconf/04.png
share/doc/HTML/en/kcontrol/knetworkconf/05.png
share/doc/HTML/en/kcontrol/knetworkconf/06.png
share/doc/HTML/en/kcontrol/knetworkconf/07.png
share/doc/HTML/en/kcontrol/knetworkconf/08.png
share/doc/HTML/en/kcontrol/knetworkconf/09.png
share/doc/HTML/en/kcontrol/knetworkconf/11.png
share/doc/HTML/en/kcontrol/knetworkconf/about1.png
share/doc/HTML/en/kcontrol/knetworkconf/common
share/doc/HTML/en/kcontrol/knetworkconf/index.cache.bz2
share/doc/HTML/en/kcontrol/knetworkconf/index.docbook
share/doc/HTML/en/kcron/
share/doc/HTML/en/kcron/common
share/doc/HTML/en/kcron/index.cache.bz2
@ -82,7 +29,6 @@ share/doc/HTML/en/ksystemlog/
share/doc/HTML/en/ksystemlog/common
share/doc/HTML/en/ksystemlog/filter-process.png
share/doc/HTML/en/ksystemlog/first-opening.png
share/doc/HTML/en/ksystemlog/groupby-hour.png
share/doc/HTML/en/ksystemlog/index.cache.bz2
share/doc/HTML/en/ksystemlog/index.docbook
share/doc/HTML/en/ksystemlog/main-screen.png
@ -91,28 +37,14 @@ share/doc/HTML/en/kuser/common
share/doc/HTML/en/kuser/index.cache.bz2
share/doc/HTML/en/kuser/index.docbook
share/doc/HTML/en/kuser/kuser.png
share/icons/hicolor/128x128/
share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/kuser.png
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/knetworkconf.png
share/icons/hicolor/16x16/apps/kuser.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/actions/
share/icons/hicolor/22x22/actions/network_connected_lan_knc.png
share/icons/hicolor/22x22/actions/network_disconnected_lan.png
share/icons/hicolor/22x22/actions/network_disconnected_wlan.png
share/icons/hicolor/22x22/actions/network_traffic_wlan.png
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/knetworkconf.png
share/icons/hicolor/22x22/apps/kuser.png
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/knetworkconf.png
share/icons/hicolor/32x32/apps/kuser.png
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/kuser.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/kuser.png
share/kde4/services/kcm_cron.desktop
share/kde4/services/kcm_knetworkconfmodule.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor