From 54dc29530c20f9d9762b703d1176bd9ca0414e10 Mon Sep 17 00:00:00 2001 From: yocto Date: Fri, 9 Sep 2011 21:03:42 +0900 Subject: [PATCH] Ver. 0.4 Released MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * TOMOYO Linux 2.4 対応 * ベースとなるccs-editpolicyをccstools 1.8.2p4 20110820版 に変更 * ポリシー名前空間対応 * デスクトップに配置するショートカットのサンプル gpet.desktop 追加 --- ChangeLog | 6 ++++-- ChangeLog.ja | 8 +++++--- INSTALL | 52 ++++++++++++++++++++++++++----------------------- Makefile.am | 3 ++- gpet.desktop | 9 +++++++++ po/ja.po | 34 ++++++++++++++++---------------- src/gpet.c | 2 ++ src/menu.c | 4 +++- src/usr_sbin/ccstools.h | 3 ++- 9 files changed, 72 insertions(+), 49 deletions(-) create mode 100755 gpet.desktop diff --git a/ChangeLog b/ChangeLog index 0d1ac4b..b9585df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2011/09/10 yocto +2011/09/09 yocto 0.4 Released @@ -8,7 +8,9 @@ * Support policy namespace. - * Fix several bugs. + * Desktop shortcut sample [gpet.desktop] added + Usage example + cp /usr/share/doc/gpet/gpet.desktop ~/Desktop/ 2011/06/18 yocto diff --git a/ChangeLog.ja b/ChangeLog.ja index 6283a47..6411307 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,4 +1,4 @@ -2011/09/10 yocto +2011/09/09 yocto 0.4 Released @@ -8,7 +8,9 @@ * ポリシー名前空間対応 - * バグ修正 + * デスクトップに配置するショートカットのサンプル gpet.desktop 追加 + 下記のようにコピーして使用してください + cp /usr/share/doc/gpet/gpet.desktop ~/{Desktop|デスクトップ}/ 2011/06/18 yocto @@ -66,7 +68,7 @@ * フォント及び色のリソースファイルに対応 gpetrc.sample 追加 下記のようにコピーして中身を変更してください - cp /usr/share/doc/gpetrc.sample ~/.gpetrc + cp /usr/share/doc/gpet/gpetrc.sample ~/.gpetrc * プロセスモードのショーカットキーを Ctrl+O から Ctrl+@ に変更 diff --git a/INSTALL b/INSTALL index 00c3017..c4eb2c7 100644 --- a/INSTALL +++ b/INSTALL @@ -21,42 +21,46 @@ $ sudo make install *** Run *** -$ sudo sh -c 'echo /usr/sbin/gpet >> /etc/ccs/manager.conf' -$ sudo ccs-loadpolicy -m < /etc/ccs/manager.conf +$ sudo sh -c 'echo /usr/sbin/gpet >> /etc/{ccs|tomoyo}/manager.conf' +$ sudo {ccs|tomoyo}-loadpolicy -m < /etc/{ccs|tomoyo}/manager.conf -$ sudo gpet [{policy_dir|remote_ip:remote_port}] +$ sudo gpet [{policy_dir|remote_ip:remote_port}] [] Ubuntu 11.04 disable overlay scrollbars. $ sudo sh -c "LIBOVERLAY_SCROLLBAR=0 gpet" ---- Option --- +--- Options --- Font & color change $ cp /usr/share/doc/gpet/gpetrc.sample ~/.gpetrc +Desktop Launcher +$ cp /usr/share/doc/gpet/gpet.desktop ~/Desktop/ *** Instll location *** -|-- sbin -| `-- gpet -`-- share - |-- doc - | `-- gpet - | |-- AUTHORS - | |-- COPYING - | |-- ChangeLog - | |-- ChangeLog.ja - | |-- INSTALL - | |-- NEWS - | |-- README - | `-- gpetrc.sample - |-- gpet - | `-- pixmaps - | `-- tomoyo.png - `-- locale - `-- ja - `-- LC_MESSAGES - `-- gpet.mo +/usr + |-- sbin + | `-- gpet + `-- share + |-- doc + | `-- gpet + | |-- AUTHORS + | |-- COPYING + | |-- ChangeLog + | |-- ChangeLog.ja + | |-- INSTALL + | |-- NEWS + | |-- README + | |-- gpet.desktop + | `-- gpetrc.sample + |-- gpet + | `-- pixmaps + | `-- tomoyo.png + `-- locale + `-- ja + `-- LC_MESSAGES + `-- gpet.mo *** Uninstall *** diff --git a/Makefile.am b/Makefile.am index 1b92a7e..3861afc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,8 @@ gpetdoc_DATA = \ ChangeLog.ja\ INSTALL\ NEWS\ - gpetrc.sample + gpetrc.sample\ + gpet.desktop INTLTOOL_FILES = intltool-extract.in \ diff --git a/gpet.desktop b/gpet.desktop new file mode 100755 index 0000000..66fef6a --- /dev/null +++ b/gpet.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open + +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=gksudo /usr/sbin/gpet +Name=gpet +Icon=/usr/share/gpet/pixmaps/tomoyo.png diff --git a/po/ja.po b/po/ja.po index 4b5eaf4..bdc2d8a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-06 23:33+0900\n" -"PO-Revision-Date: 2011-09-06 23:33+0900\n" +"POT-Creation-Date: 2011-09-09 20:43+0900\n" +"PO-Revision-Date: 2011-09-09 20:43+0900\n" "Last-Translator: Yoshihiro Kusuno \n" "Language-Team: Japanese < >\n" "Language: \n" @@ -17,44 +17,44 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/gpet.c:1239 +#: ../src/gpet.c:1241 msgid "offline" msgstr "オフライン" -#: ../src/gpet.c:1239 +#: ../src/gpet.c:1241 msgid "nework" msgstr "ネットワーク" -#: ../src/gpet.c:1239 +#: ../src/gpet.c:1241 msgid "online" msgstr "オンライン" -#: ../src/gpet.c:1284 ../src/gpet.c:1289 ../src/menu.c:79 +#: ../src/gpet.c:1286 ../src/gpet.c:1291 ../src/menu.c:79 msgid "Statistics" msgstr "統計情報" -#: ../src/gpet.c:1295 ../src/gpet.c:1299 ../src/gpet.c:1304 +#: ../src/gpet.c:1297 ../src/gpet.c:1301 ../src/gpet.c:1306 msgid "Manager Policy" msgstr "マネージャ 一覧" -#: ../src/gpet.c:1310 ../src/gpet.c:1314 ../src/gpet.c:1319 +#: ../src/gpet.c:1312 ../src/gpet.c:1316 ../src/gpet.c:1321 msgid "Domain Policy Editor" msgstr "ドメインポリシーエディタ" -#: ../src/gpet.c:1492 ../src/gpet.c:1517 +#: ../src/gpet.c:1494 ../src/gpet.c:1519 msgid "gpet" msgstr "ｇｐｅｔ" #. create tab -#: ../src/gpet.c:1642 ../src/menu.c:473 +#: ../src/gpet.c:1644 ../src/menu.c:473 msgid "Domain Transition" msgstr "ドメイン遷移 一覧" -#: ../src/gpet.c:1643 +#: ../src/gpet.c:1645 msgid "Exception Policy" msgstr "例外ポリシー 一覧" -#: ../src/gpet.c:1644 +#: ../src/gpet.c:1646 msgid "Profile" msgstr "プロファイル 一覧" @@ -159,7 +159,7 @@ msgid "_Manager..." msgstr "マネージャ...(_M)" #: ../src/menu.c:77 -msgid "Manager Profile Editor" +msgid "Manager Policy Editor" msgstr "マネージャ 一覧" #: ../src/menu.c:78 @@ -272,19 +272,19 @@ msgstr "ポリシー名前空間を追加します。" msgid "Profile list" msgstr "プロファイルを選択します。" -#: ../src/menu.c:1307 +#: ../src/menu.c:1309 msgid "Profile Edit" msgstr "プロファイルを変更します。" -#: ../src/menu.c:1391 +#: ../src/menu.c:1393 msgid "Yoshihiro Kusuno " msgstr "クスノ　" -#: ../src/menu.c:1392 +#: ../src/menu.c:1394 msgid "ccstools --- kumaneko san" msgstr "ccstools --- 熊猫さん" -#: ../src/menu.c:1394 +#: ../src/menu.c:1396 msgid "Yoshihiro Kusuno" msgstr "クスノ" diff --git a/src/gpet.c b/src/gpet.c index 3f2448c..c2926ef 100644 --- a/src/gpet.c +++ b/src/gpet.c @@ -148,6 +148,8 @@ static int add_tree_store(GtkTreeStore *store, GtkTreeIter *parent_iter, transition_control->type == CCS_TRANSITION_CONTROL_KEEP ? "green" : "cyan"; } else if (is_jump_source(dp, *index)) { /* initialize_domain */ + g_free(name); + name = g_strdup(dp->list[*index].target->name); redirect_index = get_find_target_domain(*index); color = "blue"; if (redirect_index >= 0) diff --git a/src/menu.c b/src/menu.c index 6eade63..e67745a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -74,7 +74,7 @@ static GtkActionEntry entries[] = { {"Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", N_("Refresh to the latest information"), G_CALLBACK(refresh_transition)}, {"Manager", GTK_STOCK_DND, N_("_Manager..."), "M", - N_("Manager Profile Editor"), G_CALLBACK(manager_transition)}, + N_("Manager Policy Editor"), G_CALLBACK(manager_transition)}, {"Memory", GTK_STOCK_DND, N_("_Statistics..."), "S", N_("Statistics"), G_CALLBACK(memory_transition)}, @@ -1239,6 +1239,8 @@ static void set_domain(transition_t *transition) listview = create_list_profile(); g_signal_connect(G_OBJECT(listview), "row-activated", G_CALLBACK(cb_profile_activate), dialog); + if (get_profile(&(transition->prf.list), &(transition->prf.count))) + return; add_list_profile(listview, &(transition->prf)); view_cursor_set(listview, NULL, NULL); gtk_container_add( diff --git a/src/usr_sbin/ccstools.h b/src/usr_sbin/ccstools.h index 4a49c67..5006e7e 100644 --- a/src/usr_sbin/ccstools.h +++ b/src/usr_sbin/ccstools.h @@ -53,9 +53,10 @@ #ifdef __GPET _Bool is_ccs(void); -#define CCS_PROC_POLICY_DIR "/proc/ccs/" #define TOMOYO_PROC_POLICY_DIR "/sys/kernel/security/tomoyo/" +#define CCS_PROC_POLICY_DIR \ + is_ccs() ? "/proc/ccs/" : "/sys/kernel/security/tomoyo/" #define CCS_PROC_POLICY_DOMAIN_POLICY \ is_ccs() ? "/proc/ccs/domain_policy" : \ "/sys/kernel/security/tomoyo/domain_policy" -- 2.11.0