]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
saving uncommitted changes in /etc prior to emerge run
authorFrank Brehm <frank@brehm-online.com>
Wed, 18 May 2016 20:19:15 +0000 (22:19 +0200)
committerFrank Brehm <frank@brehm-online.com>
Wed, 18 May 2016 20:19:15 +0000 (22:19 +0200)
config-archive/etc/ulogd.conf
config-archive/etc/ulogd.conf.1
config-archive/etc/ulogd.conf.2
config-archive/etc/ulogd.conf.3 [new file with mode: 0644]
config-archive/etc/ulogd.conf.dist
portage/package.keywords
portage/package.use
ulogd.conf

index 313da0f9c2248c55c857c16e89988f18d41efe62..a5ff4edb0dafd661131685b979abc43305a99639 100644 (file)
@@ -49,6 +49,7 @@ plugin="/usr/lib64/ulogd/ulogd_output_GPRINT.so"
 plugin="/usr/lib64/ulogd/ulogd_raw2packet_BASE.so"
 plugin="/usr/lib64/ulogd/ulogd_inpflow_NFACCT.so"
 plugin="/usr/lib64/ulogd/ulogd_output_GRAPHITE.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_JSON.so"
 
 # this is a stack for logging packet send by system via LOGEMU
 stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
@@ -92,6 +93,9 @@ stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 # this is a stack for logging packet to PGsql after a collect via NFLOG
 #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL
 
+# this is a stack for logging packet to JSON formatted file after a collect via NFLOG
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,json1:JSON
+
 # this is a stack for logging packets to syslog after a collect via NFLOG
 #stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG
 
@@ -195,6 +199,17 @@ timestamp=1
 directory="/var/log/ulogd/"
 sync=1
 
+[json1]
+sync=1
+#file="/var/log/ulogd/ulogd.json"
+#timestamp=0
+# device name to be used in JSON message
+#device="My awesome Netfilter firewall"
+# If boolean_label is set to 1 then the numeric_label put on packet
+# by the input plugin is coding the action on packet: if 0, then
+# packet has been blocked and if non null it has been accepted.
+#boolean_label=1
+
 [pcap1]
 #default file is /var/log/ulogd/ulogd.pcap
 #file="/var/log/ulogd/ulogd.pcap"
index b58522d717e007ad5f84b765ba86e45bae378910..313da0f9c2248c55c857c16e89988f18d41efe62 100644 (file)
@@ -197,7 +197,7 @@ sync=1
 
 [pcap1]
 #default file is /var/log/ulogd/ulogd.pcap
-#file=/var/log/ulogd/ulogd.pcap
+#file="/var/log/ulogd/ulogd.pcap"
 sync=1
 
 [mysql1]
@@ -207,6 +207,13 @@ user="nupik"
 table="ulog"
 pass="changeme"
 procedure="INSERT_PACKET_FULL"
+# backlog configuration:
+# set backlog_memcap to the size of memory that will be
+# allocated to store events in memory if data is temporary down
+# and insert them when the database came back.
+#backlog_memcap=1000000
+# number of events to insert at once when backlog is not empty
+#backlog_oneshot_requests=10
 
 [mysql2]
 db="nulog"
@@ -224,6 +231,18 @@ table="ulog"
 #schema="public"
 pass="changeme"
 procedure="INSERT_PACKET_FULL"
+# connstring can be used to define PostgreSQL connection string which
+# contains all parameters of the connection. If set, this value has
+# precedence on other variables used to build the connection string.
+# See http://www.postgresql.org/docs/9.2/static/libpq-connect.html#LIBPQ-CONNSTRING
+# for a complete description of options.
+#connstring="host=localhost port=4321 dbname=nulog user=nupik password=changeme"
+#backlog_memcap=1000000
+#backlog_oneshot_requests=10
+# If superior to 1 a thread dedicated to SQL request execution
+# is created. The value stores the number of SQL request to keep
+# in the ring buffer
+#ring_buffer_size=1000
 
 [pgsql2]
 db="nulog"
index 348e800750556b541e1c2687dad930d99472d987..b58522d717e007ad5f84b765ba86e45bae378910 100644 (file)
@@ -1,27 +1,17 @@
 # Example configuration for ulogd
-# $Id: ulogd.conf.in 714 2005-02-19 21:33:43Z laforge $
-#
+# Adapted to Debian by Achilleas Kotsis <achille@debian.gr>
 
 [global]
 ######################################################################
 # GLOBAL OPTIONS
 ######################################################################
 
-# netlink multicast group (the same as the iptables --ulog-nlgroup param)
-nlgroup=1
 
 # logfile for status messages
-logfile="/var/log/fw/ulogd.log"
-
-# loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
-loglevel=5
-
-# socket receive buffer size (should be at least the size of the
-# in-kernel buffer (ipt_ULOG.o 'nlbufsiz' parameter)
-rmem=131071
+logfile="/var/log/ulogd/ulogd.log"
 
-# libipulog/ulogd receive buffer size, should be > rmem
-bufsize=150000
+# loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5)
+# loglevel=1
 
 ######################################################################
 # PLUGIN OPTIONS
@@ -34,51 +24,273 @@ bufsize=150000
 # 2. options for each plugin in seperate section below
 
 
-#
-# ulogd_BASE.so - interpreter plugin for basic IPv4 header fields
-#                you will always need this
-plugin="/usr/lib64/ulogd/ulogd_BASE.so"
+plugin="/usr/lib64/ulogd/ulogd_inppkt_NFLOG.so"
+#plugin="/usr/lib64/ulogd/ulogd_inppkt_ULOG.so"
+#plugin="/usr/lib64/ulogd/ulogd_inppkt_UNIXSOCK.so"
+plugin="/usr/lib64/ulogd/ulogd_inpflow_NFCT.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_IFINDEX.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_IP2STR.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_IP2BIN.so"
+#plugin="/usr/lib64/ulogd/ulogd_filter_IP2HBIN.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_PRINTPKT.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_HWHDR.so"
+plugin="/usr/lib64/ulogd/ulogd_filter_PRINTFLOW.so"
+#plugin="/usr/lib64/ulogd/ulogd_filter_MARK.so"
+plugin="/usr/lib64/ulogd/ulogd_output_LOGEMU.so"
+plugin="/usr/lib64/ulogd/ulogd_output_SYSLOG.so"
+plugin="/usr/lib64/ulogd/ulogd_output_XML.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_SQLITE3.so"
+plugin="/usr/lib64/ulogd/ulogd_output_GPRINT.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_NACCT.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_PCAP.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_PGSQL.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_MYSQL.so"
+#plugin="/usr/lib64/ulogd/ulogd_output_DBI.so"
+plugin="/usr/lib64/ulogd/ulogd_raw2packet_BASE.so"
+plugin="/usr/lib64/ulogd/ulogd_inpflow_NFACCT.so"
+plugin="/usr/lib64/ulogd/ulogd_output_GRAPHITE.so"
+
+# this is a stack for logging packet send by system via LOGEMU
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+# this is a stack for packet-based logging via LOGEMU
+stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+# this is a stack for ULOG packet-based logging via LOGEMU
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+# this is a stack for packet-based logging via LOGEMU with filtering on MARK
+#stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+# this is a stack for packet-based logging via GPRINT
+#stack=log1:NFLOG,gp1:GPRINT
+
+# this is a stack for flow-based logging via LOGEMU
+#stack=ct1:NFCT,ip2str1:IP2STR,print1:PRINTFLOW,emu1:LOGEMU
+
+# this is a stack for flow-based logging via GPRINT
+#stack=ct1:NFCT,gp1:GPRINT
+
+# this is a stack for flow-based logging via XML
+#stack=ct1:NFCT,xml1:XML
+
+# this is a stack for logging in XML
+#stack=log1:NFLOG,xml1:XML
+
+# this is a stack for accounting-based logging via XML
+#stack=acct1:NFACCT,xml1:XML
+
+# this is a stack for accounting-based logging to a Graphite server
+#stack=acct1:NFACCT,graphite1:GRAPHITE
+
+# this is a stack for NFLOG packet-based logging to PCAP
+#stack=log2:NFLOG,base1:BASE,pcap1:PCAP
+
+# this is a stack for logging packet to MySQL
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2bin1:IP2BIN,mac2str1:HWHDR,mysql1:MYSQL
+
+# this is a stack for logging packet to PGsql after a collect via NFLOG
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,mac2str1:HWHDR,pgsql1:PGSQL
+
+# this is a stack for logging packets to syslog after a collect via NFLOG
+#stack=log3:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG
+
+# this is a stack for logging packets to syslog after a collect via NuFW
+#stack=nuauth1:UNIXSOCK,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,sys1:SYSLOG
+
+# this is a stack for flow-based logging to MySQL
+#stack=ct1:NFCT,ip2bin1:IP2BIN,mysql2:MYSQL
+
+# this is a stack for flow-based logging to PGSQL
+#stack=ct1:NFCT,ip2str1:IP2STR,pgsql2:PGSQL
+
+# this is a stack for flow-based logging to PGSQL without local hash
+#stack=ct1:NFCT,ip2str1:IP2STR,pgsql3:PGSQL
+
+# this is a stack for flow-based logging to SQLITE3
+#stack=ct1:NFCT,sqlite3_ct:SQLITE3
+
+# this is a stack for logging packet to SQLITE3
+#stack=log1:NFLOG,sqlite3_pkt:SQLITE3
+
+# this is a stack for flow-based logging in NACCT compatible format
+#stack=ct1:NFCT,ip2str1:IP2STR,nacct1:NACCT
+
+# this is a stack for accounting-based logging via GPRINT
+#stack=acct1:NFACCT,gp1:GPRINT
+
+[ct1]
+#netlink_socket_buffer_size=217088
+#netlink_socket_buffer_maxsize=1085440
+#netlink_resync_timeout=60 # seconds to wait to perform resynchronization
+#pollinterval=10 # use poll-based logging instead of event-driven
+# If pollinterval is not set, NFCT plugin will work in event mode
+# In this case, you can use the following filters on events:
+#accept_src_filter=192.168.1.0/24,1:2::/64 # source ip of connection must belong to these networks
+#accept_dst_filter=192.168.1.0/24 # destination ip of connection must belong to these networks
+#accept_proto_filter=tcp,sctp # layer 4 proto of connections
+
+[ct2]
+#netlink_socket_buffer_size=217088
+#netlink_socket_buffer_maxsize=1085440
+#reliable=1 # enable reliable flow-based logging (may drop packets)
+hash_enable=0
+
+# Logging of system packet through NFLOG
+[log1]
+# netlink multicast group (the same as the iptables --nflog-group param)
+# Group O is used by the kernel to log connection tracking invalid message
+group=0
+#netlink_socket_buffer_size=217088
+#netlink_socket_buffer_maxsize=1085440
+# set number of packet to queue inside kernel
+#netlink_qthreshold=1
+# set the delay before flushing packet in the queue inside kernel (in 10ms)
+#netlink_qtimeout=100
 
+# packet logging through NFLOG for group 1
+[log2]
+# netlink multicast group (the same as the iptables --nflog-group param)
+group=1 # Group has to be different from the one use in log1
+#netlink_socket_buffer_size=217088
+#netlink_socket_buffer_maxsize=1085440
+# If your kernel is older than 2.6.29 and if a NFLOG input plugin with
+# group 0 is not used by any stack, you need to have at least one NFLOG
+# input plugin with bind set to 1. If you don't do that you may not
+# receive any message from the kernel.
+#bind=1
 
-# output plugins. 
-plugin="/usr/lib64/ulogd/ulogd_LOGEMU.so"
-#plugin="/usr/lib64/ulogd/ulogd_OPRINT.so"
-#plugin="/usr/lib64/ulogd/ulogd_MYSQL.so"
-#plugin="/usr/lib64/ulogd/ulogd_PGSQL.so"
-#plugin="/usr/lib64/ulogd/ulogd_SQLITE3.so"
-#plugin="/usr/lib64/ulogd/ulogd_PCAP.so"
+# packet logging through NFLOG for group 2, numeric_label is
+# set to 1
+[log3]
+# netlink multicast group (the same as the iptables --nflog-group param)
+group=2 # Group has to be different from the one use in log1/log2
+numeric_label=1 # you can label the log info based on the packet verdict
+#netlink_socket_buffer_size=217088
+#netlink_socket_buffer_maxsize=1085440
+#bind=1
 
+[ulog1]
+# netlink multicast group (the same as the iptables --ulog-nlgroup param)
+nlgroup=1
+#numeric_label=0 # optional argument
+
+[nuauth1]
+socket_path="/run/nuauth_ulogd2.sock"
+
+[emu1]
+file="/var/log/ulogd/syslogemu.log"
+sync=1
+
+[op1]
+file="/var/log/ulogd/oprint.log"
+sync=1
 
-[LOGEMU]
-#file="/var/log/ulogd.syslogemu"
-file="/var/log/fw/iptables.log"
+[gp1]
+file="/var/log/ulogd/gprint.log"
 sync=1
+timestamp=1
 
-[OPRINT]
-#file="/var/log/ulogd.pktlog"
-file="/var/log/fw/ulogd.pktlog"
+[xml1]
+directory="/var/log/ulogd/"
+sync=1
 
-[MYSQL]
+[pcap1]
+#default file is /var/log/ulogd/ulogd.pcap
+#file=/var/log/ulogd/ulogd.pcap
+sync=1
+
+[mysql1]
+db="nulog"
+host="localhost"
+user="nupik"
 table="ulog"
 pass="changeme"
-user="laforge"
-db="ulogd"
+procedure="INSERT_PACKET_FULL"
+
+[mysql2]
+db="nulog"
 host="localhost"
+user="nupik"
+table="conntrack"
+pass="changeme"
+procedure="INSERT_CT"
 
-[PGSQL]
+[pgsql1]
+db="nulog"
+host="localhost"
+user="nupik"
 table="ulog"
-schema="public"
+#schema="public"
+pass="changeme"
+procedure="INSERT_PACKET_FULL"
+
+[pgsql2]
+db="nulog"
+host="localhost"
+user="nupik"
+table="ulog2_ct"
+#schema="public"
+pass="changeme"
+procedure="INSERT_CT"
+
+[pgsql3]
+db="nulog"
+host="localhost"
+user="nupik"
+table="ulog2_ct"
+#schema="public"
 pass="changeme"
-user="postgres"
-db="ulogd"
+procedure="INSERT_OR_REPLACE_CT"
+
+[pgsql4]
+db="nulog"
 host="localhost"
+user="nupik"
+table="nfacct"
+#schema="public"
+pass="changeme"
+procedure="INSERT_NFACCT"
 
-[SQLITE3]
+[dbi1]
+db="ulog2"
+dbtype="pgsql"
+host="localhost"
+user="ulog2"
 table="ulog"
-db="/path/to/sqlite/db"
+pass="ulog2"
+procedure="INSERT_PACKET_FULL"
+
+[sqlite3_ct]
+table="ulog_ct"
+db="/var/log/ulogd/ulogd.sqlite3db"
 buffer=200
 
-[PCAP]
-file="/var/log/ulogd.pcap"
-sync=1
+[sqlite3_pkt]
+table="ulog_pkt"
+db="/var/log/ulogd/ulogd.sqlite3db"
+buffer=200
+
+[sys2]
+facility=LOG_LOCAL2
+
+[nacct1]
+sync = 1
+#file = /var/log/ulogd/ulogd_nacct.log
+
+[mark1]
+mark = 1
+
+[acct1]
+pollinterval = 2
+# If set to 0, we don't reset the counters for each polling (default is 1).
+#zerocounter = 0
+# Set timestamp (default is 0, which means not set). This timestamp can be
+# interpreted by the output plugin.
+#timestamp = 1
 
+[graphite1]
+host="127.0.0.1"
+port="2003"
+# Prefix of data name sent to graphite server
+prefix="netfilter.nfacct"
diff --git a/config-archive/etc/ulogd.conf.3 b/config-archive/etc/ulogd.conf.3
new file mode 100644 (file)
index 0000000..348e800
--- /dev/null
@@ -0,0 +1,84 @@
+# Example configuration for ulogd
+# $Id: ulogd.conf.in 714 2005-02-19 21:33:43Z laforge $
+#
+
+[global]
+######################################################################
+# GLOBAL OPTIONS
+######################################################################
+
+# netlink multicast group (the same as the iptables --ulog-nlgroup param)
+nlgroup=1
+
+# logfile for status messages
+logfile="/var/log/fw/ulogd.log"
+
+# loglevel: debug(1), info(3), notice(5), error(7) or fatal(8)
+loglevel=5
+
+# socket receive buffer size (should be at least the size of the
+# in-kernel buffer (ipt_ULOG.o 'nlbufsiz' parameter)
+rmem=131071
+
+# libipulog/ulogd receive buffer size, should be > rmem
+bufsize=150000
+
+######################################################################
+# PLUGIN OPTIONS
+######################################################################
+
+# We have to configure and load all the plugins we want to use
+
+# general rules:
+# 1. load the plugins _first_ from the global section
+# 2. options for each plugin in seperate section below
+
+
+#
+# ulogd_BASE.so - interpreter plugin for basic IPv4 header fields
+#                you will always need this
+plugin="/usr/lib64/ulogd/ulogd_BASE.so"
+
+
+# output plugins. 
+plugin="/usr/lib64/ulogd/ulogd_LOGEMU.so"
+#plugin="/usr/lib64/ulogd/ulogd_OPRINT.so"
+#plugin="/usr/lib64/ulogd/ulogd_MYSQL.so"
+#plugin="/usr/lib64/ulogd/ulogd_PGSQL.so"
+#plugin="/usr/lib64/ulogd/ulogd_SQLITE3.so"
+#plugin="/usr/lib64/ulogd/ulogd_PCAP.so"
+
+
+[LOGEMU]
+#file="/var/log/ulogd.syslogemu"
+file="/var/log/fw/iptables.log"
+sync=1
+
+[OPRINT]
+#file="/var/log/ulogd.pktlog"
+file="/var/log/fw/ulogd.pktlog"
+
+[MYSQL]
+table="ulog"
+pass="changeme"
+user="laforge"
+db="ulogd"
+host="localhost"
+
+[PGSQL]
+table="ulog"
+schema="public"
+pass="changeme"
+user="postgres"
+db="ulogd"
+host="localhost"
+
+[SQLITE3]
+table="ulog"
+db="/path/to/sqlite/db"
+buffer=200
+
+[PCAP]
+file="/var/log/ulogd.pcap"
+sync=1
+
index e5aad26ab2de0936c3ac6f0afecf927a975374be..e2721694d0ff950ef02c07a66e7aa6eb36384b79 100644 (file)
@@ -209,6 +209,9 @@ sync=1
 # by the input plugin is coding the action on packet: if 0, then
 # packet has been blocked and if non null it has been accepted.
 #boolean_label=1
+# Uncomment the following line to use JSON v1 event format that
+# can provide better compatility with some JSON file reader.
+#eventv1=1
 
 [pcap1]
 #default file is /var/log/ulogd/ulogd.pcap
@@ -298,12 +301,10 @@ procedure="INSERT_PACKET_FULL"
 [sqlite3_ct]
 table="ulog_ct"
 db="/var/log/ulogd/ulogd.sqlite3db"
-buffer=200
 
 [sqlite3_pkt]
 table="ulog_pkt"
 db="/var/log/ulogd/ulogd.sqlite3db"
-buffer=200
 
 [sys2]
 facility=LOG_LOCAL2
index 947250b9add4237e4e97f599a47234bb86d1e0f9..f56a32ec29b3c2fd238730f84350393e6bec67a8 100644 (file)
@@ -49,6 +49,8 @@ app-misc/ddate
 
 ~app-vim/salt-vim-20151119
 
+~dev-cpp/eigen-3.2.8
+
 ~dev-db/sqlite-3.8.5
 ~dev-db/sqlite-3.9.2
 ~dev-db/virtuoso-odbc-6.1.4
@@ -67,6 +69,7 @@ app-misc/ddate
 
 # ~dev-libs/folks-0.8.0
 # ~dev-libs/gjs-1.34.0
+~dev-libs/grantlee-5.1.0
 ~dev-libs/icu-51.1
 ~dev-libs/libappindicator-12.10.0
 ~dev-libs/libdbusmenu-12.10.2
@@ -178,8 +181,180 @@ dev-vcs/rcs-fast-export           **
 # ~gnome-extra/gucharmap-3.6.1
 # ~gnome-extra/yelp-3.6.2
 
+~kde-apps/analitza-15.12.3
+~kde-apps/ark-15.12.3
+~kde-apps/artikulate-15.12.3 
+~kde-apps/audiocd-kio-15.12.3
+~kde-apps/baloo-widgets-15.12.3
+~kde-apps/blinken-15.12.3
+~kde-apps/bomber-15.12.3
+~kde-apps/bovo-15.12.3
+~kde-apps/cantor-15.12.3
+~kde-apps/dolphin-15.12.3
+~kde-apps/dragon-15.12.3
+~kde-apps/ffmpegthumbs-15.12.3
+~kde-apps/filelight-15.12.3
+~kde-apps/granatier-15.12.3
+~kde-apps/gwenview-15.12.3
+~kde-apps/juk-15.12.3
+~kde-apps/kaccounts-integration-15.12.3
+~kde-apps/kaccounts-providers-15.12.3
+~kde-apps/kajongg-15.12.3
+~kde-apps/kalgebra-15.12.3
+~kde-apps/kalzium-15.12.3
+~kde-apps/kamera-15.12.3
+~kde-apps/kanagram-15.12.3
+~kde-apps/kapman-15.12.3
+~kde-apps/kate-15.12.3
+~kde-apps/katomic-15.12.3
+~kde-apps/kblackbox-15.12.3
+~kde-apps/kblocks-15.12.3
+~kde-apps/kbounce-15.12.3
+~kde-apps/kbreakout-15.12.3
+~kde-apps/kbruch-15.12.3
+~kde-apps/kcalc-15.12.3
+~kde-apps/kcharselect-15.12.3
+~kde-apps/kcmshell-15.12.3
+~kde-apps/kcolorchooser-15.12.3
+~kde-apps/kcron-15.12.3
+~kde-apps/kde4-l10n-15.12.3
+~kde-apps/kdeadmin-meta-15.12.3
+~kde-apps/kde-apps-meta-15.12.3
+~kde-apps/kdebase-data-15.12.3
+~kde-apps/kdebase-desktoptheme-15.12.3
+~kde-apps/kdebase-menu-15.12.3
+~kde-apps/kdebase-menu-icons-15.12.3
+~kde-apps/kdebase-runtime-meta-15.12.3
+~kde-apps/kdebugdialog-15.12.3
+~kde-apps/kdebugsettings-15.12.3
+~kde-apps/kdecore-meta-15.12.3
+~kde-apps/kdeedu-data-15.12.3
+~kde-apps/kdeedu-meta-15.12.3
+~kde-apps/kdegames-meta-15.12.3 
+~kde-apps/kdegraphics-meta-15.12.3
+~kde-apps/kdegraphics-mobipocket-15.12.3
+~kde-apps/kde-l10n-15.12.3
+~kde-apps/kdemultimedia-meta-15.12.3
+~kde-apps/kdenetwork-filesharing-15.12.3
+~kde-apps/kdenetwork-meta-15.12.3
+~kde-apps/kdenlive-15.12.3
+~kde-apps/kdesu-15.12.3
+~kde-apps/kdetoys-meta-15.08.3
+~kde-apps/kdeutils-meta-15.12.3
+~kde-apps/kdiamond-15.12.3
+~kde-apps/kdf-15.12.3
+~kde-apps/kdontchangethehostname-15.12.3
+~kde-apps/keditfiletype-15.12.3
+~kde-apps/kfile-15.12.3
+~kde-apps/kfourinline-15.12.3
+~kde-apps/kgoldrunner-15.12.3
+~kde-apps/kgeography-15.12.3
+~kde-apps/kget-15.12.3
+~kde-apps/khangman-15.12.3
+~kde-apps/khelpcenter-5.5.5
+~kde-apps/kiconfinder-15.12.3 
+~kde-apps/kig-15.12.3
+~kde-apps/kigo-15.12.3
+~kde-apps/killbots-15.12.3
+~kde-apps/kimgio-15.12.3
+~kde-apps/kioclient-15.12.3
+~kde-apps/kio-extras-15.12.3
+~kde-apps/kiriki-15.12.3
+~kde-apps/kiten-15.12.3
+~kde-apps/kjumpingcube-15.12.3
+~kde-apps/klettres-15.12.3
+~kde-apps/klickety-15.12.3
+~kde-apps/klines-15.12.3
+~kde-apps/kmahjongg-15.12.3
+~kde-apps/kmimetypefinder-15.12.3
+~kde-apps/kmines-15.12.3
+~kde-apps/kmix-15.12.3
+~kde-apps/kmplot-15.12.3
+~kde-apps/knavalbattle-15.12.3
+~kde-apps/knetwalk-15.12.3
+~kde-apps/knewstuff-15.12.3
+~kde-apps/knotify-15.12.3
+~kde-apps/kolf-15.12.3
+~kde-apps/kollision-15.12.3
+~kde-apps/kolourpaint-15.12.3
+~kde-apps/konquest-15.12.3
+~kde-apps/konsole-15.12.3
+~kde-apps/kpasswdserver-15.12.3
+~kde-apps/kpat-15.12.3
+~kde-apps/kqtquickcharts-15.12.3
+~kde-apps/kquitapp-15.12.3
+~kde-apps/krdc-15.12.3
+~kde-apps/kreadconfig-15.12.3
+~kde-apps/kreversi-15.12.3
+~kde-apps/krfb-15.12.3
+~kde-apps/kruler-15.12.3
+~kde-apps/kscd-15.12.3
+~kde-apps/kshisen-15.12.3
+~kde-apps/ksirk-15.12.3 
+~kde-apps/ksnakeduel-15.12.3
+~kde-apps/kspaceduel-15.12.3
+~kde-apps/ksquares-15.12.3
+~kde-apps/kstars-15.12.3
+~kde-apps/kstart-15.12.3
+~kde-apps/ksudoku-15.12.3
+~kde-apps/ksystemlog-15.12.3
+~kde-apps/kteatime-15.12.3
+~kde-apps/ktimer-15.12.3
+~kde-apps/ktimezoned-15.12.3
+~kde-apps/ktouch-15.12.3
+~kde-apps/ktp-accounts-kcm-15.12.3
+~kde-apps/ktp-approver-15.12.3
+~kde-apps/ktp-auth-handler-15.12.3
+~kde-apps/ktp-common-internals-15.12.3
+~kde-apps/ktp-contact-list-15.12.3
+~kde-apps/ktp-contact-runner-15.12.3
+~kde-apps/ktp-desktop-applets-15.12.3
+~kde-apps/ktp-filetransfer-handler-15.12.3
+~kde-apps/ktp-kded-module-15.12.3
+~kde-apps/ktp-l10n-15.12.3
+~kde-apps/ktp-send-file-15.12.3
+~kde-apps/ktp-text-ui-15.12.3
+~kde-apps/ktraderclient-15.12.3
+~kde-apps/ktuberling-15.12.3
+~kde-apps/kturtle-15.12.3
+~kde-apps/kubrick-15.12.3
+~kde-apps/kurifilter-plugins-15.12.3
+~kde-apps/kwalletd-15.12.3
+~kde-apps/kwalletmanager-15.12.3
+~kde-apps/kwordquiz-15.12.3
+~kde-apps/kwrite-15.12.3
+~kde-apps/libkcddb-15.12.3
+~kde-apps/libkcompactdisc-15.12.3
+~kde-apps/libkdcraw-15.12.3
+~kde-apps/libkeduvocdocument-15.12.3
+~kde-apps/libkexiv2-15.12.3
+~kde-apps/libkdegames-15.12.3
+~kde-apps/libkipi-15.12.3
+~kde-apps/libkmahjongg-15.12.3
+~kde-apps/lskat-15.12.3
+~kde-apps/okular-15.12.3
+~kde-apps/palapeli-15.12.3
+~kde-apps/parley-15.12.3
+~kde-apps/phonon-kde-15.12.3
+~kde-apps/picmi-15.12.3
+~kde-apps/plasma-runtime-15.12.3
+~kde-apps/plasma-telepathy-meta-15.12.3
+~kde-apps/print-manager-15.12.3
+~kde-apps/renamedlg-plugins-15.12.3
+~kde-apps/rocs-15.12.3
+~kde-apps/signon-kwallet-extension-15.12.3
+~kde-apps/solid-runtime-15.12.3
+~kde-apps/spectacle-15.12.3
+~kde-apps/step-15.12.3
+~kde-apps/svgpart-15.12.3
+~kde-apps/sweeper-15.12.3
+~kde-apps/thumbnailers-15.12.3
+~kde-apps/zeroconf-ioslave-15.12.3
+
 # ~kde-base/pykde4-4.14.3
 
+~kde-plasma/kwallet-pam-5.6.4
+
 mail-client/thunderbird
 
 ~mate-base/caja-1.8.0
@@ -246,6 +421,7 @@ mail-client/thunderbird
 ~media-libs/libsidplayfp-1.1.0
 ~media-libs/libpng-1.6.18
 ~media-libs/mesa-10.3.4
+~media-libs/mlt-6.2.0
 ~media-libs/xine-lib-1.2.6
 
 ~media-plugins/audacious-plugins-3.4.1
@@ -259,6 +435,7 @@ mail-client/thunderbird
 ~media-video/lxdvdrip-1.76
 ~media-video/lxdvdrip-1.77
 ~media-video/m2vrequantizer-0.0.2_pre20060306
+~media-video/movit-1.3.2
 #~media-video/mplayer-1.2_pre20141011
 ~media-video/mplayer-1.2_pre20150214
 ~media-video/streamdvd-0.4
@@ -267,8 +444,16 @@ mail-client/thunderbird
 
 net-im/skype
 
+~net-libs/accounts-qt-1.13
 ~net-libs/czmq-3.0.2
+~net-libs/libaccounts-glib-1.21
+~net-libs/libsignon-glib-1.13
 ~net-libs/libvncserver-0.9.9
+~net-libs/signond-8.58
+~net-libs/signon-oauth2-0.21
+~net-libs/signon-ui-0.15
+~net-libs/telepathy-accounts-signon-1.0
+~net-libs/telepathy-logger-qt-15.04.0
 # ~net-libs/telepathy-farstream-0.6.0
 
 # ~net-misc/vinagre-3.6.2
index 22cea374bebd90b96f36ab3fc12a714f2ae2803b..61502f0ee784a385bdf526bca9afa68c0a74661a 100644 (file)
@@ -118,8 +118,9 @@ dev-python/rpy                              -doc
 dev-python/sphinx                      -doc
 dev-python/stevedore                   -doc
 
-# move x11-libs/qt-core dev-qt/qtcore
+dev-qt/qtmultimedia                    qml
 dev-qt/qtcore                          optimized-qmake
+dev-qt/qtscript                                scripttools
 dev-qt/qtwebkit                                -exceptions
 
 dev-ruby/hoe                           -doc
@@ -160,20 +161,16 @@ gnome-extra/libgda                        mdb xbase
 
 gnustep-base/gnustep-make              -doc native-exceptions
 
-# move kde-base/gwenview kde-apps/gwenview
 kde-apps/gwenview                      kipi
-# move kde-base/juk kde-apps/juk
 kde-apps/juk                           tunepimp
-# move kde-base/kopete kde-apps/kopete
+kde-apps/kde4-l10n                     minimal
 kde-apps/kopete                                addbookmarks alias autoreplace connectionstatus contactnotes gadu groupwise highlight history irc -jingle latex netmeeting nowlistening oscar sametime sms statistics testbed texteffect translator webpresence winpopup wlm
-# move kde-base/krdc kde-apps/krdc
 kde-apps/krdc                          rdp vnc
-# move kde-base/kstars kde-apps/kstars
 kde-apps/kstars                                nova sbig
-# move kde-base/marble kde-apps/marble
+kde-apps/ktp-common-internals          otr
 kde-apps/marble                                designer-plugin gps
-# move kde-base/okular kde-apps/okular
 kde-apps/okular                                chm ebook
+kde-apps/solid-runtime                 -bluetooth
 
 kde-base/kaddressbook                  gnokii
 #kde-base/kdelibs                      -avahi utempter
@@ -184,6 +181,8 @@ kde-base/plasma-workspace           google-gadgets
 
 kde-frameworks/extra-cmake-modules     -doc
 
+kde-plasma/plasma-desktop              legacy-systray
+
 mail-client/claws-mail                 -pda
 mail-client/evolution                  exchange -pda
 mail-client/thunderbird                        mozdom replytolist system-sqlite
@@ -225,8 +224,8 @@ media-libs/libquicktime                     lame
 media-libs/libvorbis                   aotuv
 media-libs/libvpx                      postproc
 media-libs/libwmf                      -expat
-media-libs/mlt                         -qt4
-media-libs/mesa                                g3dvl gbm gles gles1 gles2 llvm shared-dricore xa xvmc
+media-libs/mlt                         kdenlive melt -qt4
+media-libs/mesa                                g3dvl gbm gles gles1 gles2 llvm shared-dricore wayland xa xvmc
 media-libs/netpbm                      rle
 media-libs/openjpeg                    tools
 media-libs/phonon                      gstreamer
index a5ff4edb0dafd661131685b979abc43305a99639..d10b877dfb37bb1965da9f2317f29a90c904aa44 100644 (file)
@@ -209,6 +209,9 @@ sync=1
 # by the input plugin is coding the action on packet: if 0, then
 # packet has been blocked and if non null it has been accepted.
 #boolean_label=1
+# Uncomment the following line to use JSON v1 event format that
+# can provide better compatility with some JSON file reader.
+#eventv1=1
 
 [pcap1]
 #default file is /var/log/ulogd/ulogd.pcap
@@ -298,12 +301,10 @@ procedure="INSERT_PACKET_FULL"
 [sqlite3_ct]
 table="ulog_ct"
 db="/var/log/ulogd/ulogd.sqlite3db"
-buffer=200
 
 [sqlite3_pkt]
 table="ulog_pkt"
 db="/var/log/ulogd/ulogd.sqlite3db"
-buffer=200
 
 [sys2]
 facility=LOG_LOCAL2