Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/lxsession-lite/PKGBUILD
	community/synce-odccm/PKGBUILD
	extra/cyrus-sasl-plugins/PKGBUILD

5 files changed, 0 insertions, 188 deletions

diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch
deleted file mode 100644
index ce433bb90..000000000
--- a/core/file/file-5.07-zip-detect.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur file-5.07-orig//magic/Magdir/archive file-5.07/magic/Magdir/archive
---- file-5.07-orig//magic/Magdir/archive	2011-04-24 01:02:48.000000000 +1000
-+++ file-5.07/magic/Magdir/archive	2011-07-14 11:55:11.821178049 +1000
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: archive,v 1.63 2011/04/23 15:02:48 christos Exp $
-+# $File: archive,v 1.66 2011/05/25 17:45:54 christos Exp $
- # archive:  file(1) magic for archive formats (see also "msdos" for self-
- #           extracting compressed archives)
- #
-@@ -654,12 +654,6 @@
- >>>>78	string	-template		Template
- !:mime	application/vnd.oasis.opendocument.image-template
- 
--# StarView Metafile
--# From Pierre Ducroquet <pinaraf@pinaraf.info>
--0	string	VCLMTF	StarView MetaFile
-->6	beshort	x	\b, version %d
-->8	belong	x	\b, size %d
--
- #  EPUB (OEBPS) books using OCF (OEBPS Container Format)
- #    From: Adam Buchbinder <adam.buchbinder@gmail.com>
- #    http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
-@@ -692,8 +686,15 @@
- >>4	byte		0x09		\b, at least v0.9 to extract
- >>4	byte		0x0a		\b, at least v1.0 to extract
- >>4	byte		0x0b		\b, at least v1.1 to extract
-->>0x161	string		WINZIP		\b, WinZIP self-extracting
- >>4	byte		0x14		\b, at least v2.0 to extract
-+>>4	byte		0x2d		\b, at least v3.0 to extract
-+>>0x161	string		WINZIP		\b, WinZIP self-extracting
-+
-+# StarView Metafile
-+# From Pierre Ducroquet <pinaraf@pinaraf.info>
-+0	string	VCLMTF	StarView MetaFile
-+>6	beshort	x	\b, version %d
-+>8	belong	x	\b, size %d
- 
- # Zoo archiver
- 20	lelong		0xfdc4a7dc	Zoo archive data
diff --git a/core/libsasl/cyrus-sasl-db.patch b/core/libsasl/cyrus-sasl-db.patch
deleted file mode 100644
index 08758ab85..000000000
--- a/core/libsasl/cyrus-sasl-db.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4
---- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2005-04-26 21:14:07.000000000 +0200
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4	2006-10-02 20:36:17.137852392 +0200
-@@ -213,7 +213,7 @@
- 	fi
- 
- 	saved_LIBS=$LIBS
--        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-           do
- 	    LIBS="$saved_LIBS -l$dbname"
- 	    AC_TRY_LINK([#include <db.h>],
---- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig	2009-04-28 17:09:18.000000000 +0200
-+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c	2010-05-18 21:02:20.418940098 +0200
-@@ -100,7 +100,7 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig	2003-02-13 20:56:17.000000000 +0100
-+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c	2010-05-18 21:11:09.982932556 +0200
-@@ -214,7 +214,7 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/core/pcmciautils/60-pcmcia.rules b/core/pcmciautils/60-pcmcia.rules
deleted file mode 100644
index aa3c1a2d3..000000000
--- a/core/pcmciautils/60-pcmcia.rules
+++ /dev/null
@@ -1,30 +0,0 @@
-# PCMCIA devices:
-#
-ACTION!="add", GOTO="pcmciautils_end"
-# modprobe $env{MODALIAS} loads all possibly appropriate modules
-SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
-		RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
-
-# Very few CIS firmware entries (which we use for matching)
-# are so broken that we need to read out random bytes of it
-# instead of the manufactor, card or product ID. Then the
-# matching is done in userspace.
-SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
-		RUN+="/lib/udev/pcmcia-check-broken-cis"
-
-# However, the "weak" matching by func_id is only allowed _after_ modprobe
-# returns, so that "strong" matches have a higher priority.
-SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", ATTR{allow_func_id_match}="1"
-
-# PCMCIA sockets:
-#
-# modprobe the pcmcia bus module so that 16-bit PCMCIA devices work
-SUBSYSTEM=="pcmcia_socket", \
-		RUN+="/lib/udev/load-modules.sh pcmcia"
-
-# if this is a PCMCIA socket which needs a resource database,
-# pcmcia-socket-startup sets it up
-SUBSYSTEM=="pcmcia_socket", \
-		RUN+="/lib/udev/pcmcia-socket-startup"
-
-LABEL="pcmciautils_end"
diff --git a/core/udev/static-audio-nodes-group.patch b/core/udev/static-audio-nodes-group.patch
deleted file mode 100644
index b1fc4f935..000000000
--- a/core/udev/static-audio-nodes-group.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Fri, 27 May 2011 02:50:29 +0200
-Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer}
- nodes
-
----
- rules/rules.d/50-udev-default.rules |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
-index cd745ef..cacb533 100644
---- a/rules/rules.d/50-udev-default.rules
-+++ b/rules/rules.d/50-udev-default.rules
-@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics",		GROUP="video"
- SUBSYSTEM=="drm",		GROUP="video"
- 
- # sound
--SUBSYSTEM=="sound",		GROUP="audio"
-+SUBSYSTEM=="sound",		GROUP="audio", \
-+  OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
- 
- # DVB (video)
- SUBSYSTEM=="dvb", GROUP="video"
--- 
-1.7.5.3
-
diff --git a/core/udev/static-nodes-permissions.patch b/core/udev/static-nodes-permissions.patch
deleted file mode 100644
index 51e6ad6bc..000000000
--- a/core/udev/static-nodes-permissions.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c112873b5bc9ebbae39c32f502bc6211f33546cc Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Mon, 30 May 2011 02:12:02 +0200
-Subject: [PATCH 1/2] rules: static_node - use 0660 if group is given to get
- the cigar
-
->> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote:
->
-> Close, but no cigar. Looks like the static nodes are not assigned
-> permissions 0660 even if a gid is set (the nodes have perms 0600).
->
-> Cheers,
->
-> Tom
----
- udev/udev-rules.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/udev/udev-rules.c b/udev/udev-rules.c
-index 48395e7..56a258d 100644
---- a/udev/udev-rules.c
-+++ b/udev/udev-rules.c
-@@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
- 		case TK_A_STATIC_NODE: {
- 			char filename[UTIL_PATH_SIZE];
- 			struct stat stats;
-+
- 			/* we assure, that the permissions tokens are sorted before the static token */
--			if (mode == 0 && uid == 0 && gid == 0)
-+			if (uid == 0 && gid == 0)
- 				goto next;
- 			util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/",
- 				      &rules->buf[cur->key.value_off], NULL);
-@@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules)
- 				goto next;
- 			if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode))
- 				goto next;
--			if (mode != 0 && mode != (stats.st_mode & 0777)) {
-+
-+			if (mode == 0 && gid > 0)
-+				mode = 0660;
-+			if (mode != (stats.st_mode & 0777)) {
- 				chmod(filename, mode);
- 				info(rules->udev, "chmod '%s' %#o\n", filename, mode);
- 			}
-+
- 			if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) {
- 				chown(filename, uid, gid);
- 				info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid);
- 			}
-+
- 			utimensat(AT_FDCWD, filename, NULL, 0);
- 			break;
- 		}
--- 
-1.7.5.2
-