Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-client/PKGBUILD
	community/dcron/PKGBUILD
	community/freevo/PKGBUILD
	community/gmerlin-avdecoder/PKGBUILD
	community/hacburn/PKGBUILD
	community/htmldoc/PKGBUILD
	community/ibus-table/PKGBUILD
	community/iksemel/PKGBUILD
	community/isomaster/PKGBUILD
	community/libmatio/PKGBUILD
	community/libtlen/PKGBUILD
	community/luarocks/PKGBUILD
	community/lxde-common/PKGBUILD
	community/multipath-tools/PKGBUILD
	community/nvclock/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/pidgin-musictracker/PKGBUILD
	community/pkgfile/PKGBUILD
	community/pkgtools/PKGBUILD
	community/print-manager/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python-pyxmpp/PKGBUILD
	community/python2-simplejson/PKGBUILD
	community/rsnapshot/PKGBUILD
	community/setconf/PKGBUILD
	community/tagpy/PKGBUILD
	community/terminator/PKGBUILD
	community/udunits/PKGBUILD
	community/vlock/PKGBUILD
	community/winefish/PKGBUILD
	core/nss-myhostname/PKGBUILD
	extra/avfs/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/bmp-wma/PKGBUILD
	extra/bochs/PKGBUILD
	extra/botan/PKGBUILD
	extra/cdargs/PKGBUILD
	extra/cx_freeze/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/devilspie/PKGBUILD
	extra/emelfm2/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fssos-nsvs/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hercules/PKGBUILD
	extra/herqq/PKGBUILD
	extra/hydrogen/PKGBUILD
	extra/kdegames/PKGBUILD
	extra/kradio/PKGBUILD
	extra/kshutdown/PKGBUILD
	extra/libmusicbrainz4/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD
	extra/monica/PKGBUILD
	extra/mpck/PKGBUILD
	extra/mrtg/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/normalize/PKGBUILD
	extra/oprofile/PKGBUILD
	extra/perl-event/PKGBUILD
	extra/perl-unicode-string/PKGBUILD
	extra/pidgin-encryption/PKGBUILD
	extra/proftpd/PKGBUILD
	extra/pymad/PKGBUILD
	extra/qiv/PKGBUILD
	extra/quodlibet/PKGBUILD
	extra/ratpoison/PKGBUILD
	extra/rox/PKGBUILD
	extra/scrot/PKGBUILD
	extra/stardict/PKGBUILD
	extra/terminal/PKGBUILD
	extra/usbview/PKGBUILD
	extra/xdelta/PKGBUILD
	extra/xdelta3/PKGBUILD
	extra/xorg-xlsfonts/PKGBUILD
	extra/zile/PKGBUILD
	mozilla-testing/iceweasel-libre/mozconfig
	mozilla-testing/iceweasel-libre/vendor.js
	social/tokyocabinet/PKGBUILD
	~fauno/notmuch/PKGBUILD
	~mtjm/thinkfan/PKGBUILD
	~mtjm/zbar/PKGBUILD

5 files changed, 0 insertions, 160 deletions

diff --git a/community/ulogd/logrotate b/community/ulogd/logrotate
deleted file mode 100644
index 312c71acb..000000000
--- a/community/ulogd/logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu {
-  missingok
-  notifempty
-  sharedscripts
-  create 0640 root root
-
-  postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
-  endscript
-}
diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch
deleted file mode 100644
index 87a76a22b..000000000
--- a/community/ulogd/mac-addr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ulogd_BASE.c-save	2007-08-06 11:23:53.000000000 +0200
-+++ ulogd_BASE.c	2007-08-06 11:28:47.000000000 +0200
-@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int
- {
- 	unsigned char *p;
- 	int i;
--	char *buf, *oldbuf = NULL;
-+	char *buf = NULL;
- 	ulog_iret_t *ret = ip->result;
- 
- 	if (pkt->mac_len) {
-@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int
- 		*buf = '\0';
- 
- 		p = pkt->mac;
--		oldbuf = buf;
- 		for (i = 0; i < pkt->mac_len; i++, p++)
--			sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':');
-+			sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':');
- 		ret[0].value.ptr = buf;
- 		ret[0].flags |= ULOGD_RETF_VALID;
- 	}
diff --git a/community/ulogd/rc b/community/ulogd/rc
deleted file mode 100644
index 83f0550cc..000000000
--- a/community/ulogd/rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd daemon"
-
-    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd.pid
-        add_daemon ulogd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulog daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd.pid &> /dev/null
-      rm_daemon ulogd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/ulogd/ulogd.conf.min b/community/ulogd/ulogd.conf.min
deleted file mode 100644
index 822575613..000000000
--- a/community/ulogd/ulogd.conf.min
+++ /dev/null
@@ -1,20 +0,0 @@
-[global]
-nlgroup=1
-logfile="/var/log/ulogd.log"
-loglevel=5
-rmem=131071
-bufsize=150000
-
-plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
-plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
-plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
-plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
-plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
-
-stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
-
-[ulog1]
-nlgroup=1
-
-[emu1]
-file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc
deleted file mode 100644
index 83f0550cc..000000000
--- a/community/ulogd/ulogd.rc
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd daemon"
-
-    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd.pid
-        add_daemon ulogd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulog daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd.pid &> /dev/null
-      rm_daemon ulogd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0