Tue Nov 15 14:33:58 UTC 2011

17 files changed, 0 insertions, 821 deletions

diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch
deleted file mode 100644
index 36dad59e3..000000000
--- a/extra/gnome-settings-daemon/upower.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:19:31.818642262 +0200
-+++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c	2011-10-20 08:23:55.127492221 +0200
-@@ -2066,15 +2066,15 @@
-                           (GAsyncReadyCallback) power_keyboard_ready_cb,
-                           manager);
- 
--        g_dbus_proxy_new (manager->priv->connection,
--                          G_DBUS_PROXY_FLAGS_NONE,
--                          NULL,
--                          "org.freedesktop.UPower",
--                          "/org/freedesktop/UPower",
--                          "org.freedesktop.UPower",
--                          NULL,
--                          (GAsyncReadyCallback) upower_ready_cb,
--                          manager);
-+        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-+                                  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+                                  NULL,
-+                                  "org.freedesktop.UPower",
-+                                  "/org/freedesktop/UPower",
-+                                  "org.freedesktop.UPower",
-+                                  NULL,
-+                                  (GAsyncReadyCallback) upower_ready_cb,
-+                                  manager);
- }
- 
- static void
diff --git a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch b/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch
deleted file mode 100644
index 56bd529c2..000000000
--- a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Shawn Bohrer <sbohrer@rgmadvisors.com>
-
-Only count directories that match /sys/devices/system/cpu/cpu[0-9]+ as
-CPUs.  Previously any directory that started with cpu was counted which
-caused cpufreq and cpuidle to be counted as CPUs.
-
-Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
----
- cputree.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/cputree.c b/cputree.c
-index 3b0c982..b879785 100644
---- a/cputree.c
-+++ b/cputree.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include "config.h"
-+#include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -321,7 +322,7 @@ void parse_cpu_tree(void)
- 		return;
- 	do {
- 		entry = readdir(dir);
--                if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) {
-+                if (entry && !strncmp(entry->d_name,"cpu", 3) && isdigit(entry->d_name[3])) {
- 			char new_path[PATH_MAX];
- 			sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name);
- 			do_one_cpu(new_path);
--- 
-1.6.5.2
-
diff --git a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch b/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch
deleted file mode 100644
index c2e69c218..000000000
--- a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Shawn Bohrer <sbohrer@rgmadvisors.com>
-
-Special interrupt counts line NMI may start with a space
-
-The kernel determines the maximum number of possible IRQs and pads the
-first field of /proc/interrupts appropriately.  With four or more digits
-of precession the special interrupt counts all start with a space
-instead of a letter.  This caused the special interrupt counts to be
-counted on my system and that caused the cpunr count to be off when it
-reached the ERR and MIS lines forcing a CPU rescan.
-
-Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
----
- procinterrupts.c |   24 +++++++++++-------------
- 1 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/procinterrupts.c b/procinterrupts.c
-index e336efe..322f4de 100644
---- a/procinterrupts.c
-+++ b/procinterrupts.c
-@@ -55,20 +55,18 @@ void parse_proc_interrupts(void)
- 		if (getline(&line, &size, file)==0)
- 			break;
- 
--
-+		number = strtoul(line, &c, 10);
- 		/* lines with letters in front are special, like NMI count. Ignore */
--		if (!(line[0]==' ' || (line[0]>='0' && line[0]<='9')))
--			break;
--		c = strchr(line, ':');
--		if (!c)
-+		if (line == c)
-+			continue;
-+
-+		if (c[0] == ':')
-+			++c;
-+		else
- 			continue;
--		*c = 0;
--		c++;
--		number = strtoul(line, NULL, 10);
-+
- 		count = 0;
- 		cpunr = 0;
--
--		c2=NULL;
- 		while (1) {
- 			uint64_t C;
- 			C = strtoull(c, &c2, 10);
-@@ -78,11 +76,11 @@ void parse_proc_interrupts(void)
- 			c=c2;
- 			cpunr++;
- 		}
--		if (cpunr != core_count) 
-+		if (cpunr != core_count)
- 			need_cpu_rescan = 1;
--		
-+
- 		set_interrupt_count(number, count);
--	}		
-+	}
- 	fclose(file);
- 	free(line);
- }
--- 
-1.6.5.2
-
diff --git a/extra/irqbalance/current-trunk.patch b/extra/irqbalance/current-trunk.patch
deleted file mode 100644
index 83f08575c..000000000
--- a/extra/irqbalance/current-trunk.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-Index: powermode.c
-===================================================================
---- powermode.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ powermode.c	(.../trunk)	(revision 33)
-@@ -40,7 +40,8 @@
- 	char *line = NULL;
- 	size_t size = 0;
- 	char *c;
--	uint64_t dummy, irq, softirq;
-+	uint64_t dummy __attribute__((unused));
-+	uint64_t irq, softirq;
- 	file = fopen("/proc/stat", "r");
- 	if (!file)
- 		return;
-Index: cputree.c
-===================================================================
---- cputree.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ cputree.c	(.../trunk)	(revision 33)
-@@ -47,6 +47,7 @@
- /* Users want to be able to keep interrupts away from some cpus; store these in a cpumask_t */
- cpumask_t banned_cpus;
- 
-+cpumask_t cpu_possible_map;
- 
- /* 
-    it's convenient to have the complement of banned_cpus available so that 
-@@ -158,6 +159,8 @@
- 	memset(cpu, 0, sizeof(struct cpu_core));
- 
- 	cpu->number = strtoul(&path[27], NULL, 10);
-+
-+	cpu_set(cpu->number, cpu_possible_map);
- 	
- 	cpu_set(cpu->number, cpu->mask);
- 
-@@ -219,15 +222,15 @@
- 	core_count++;
- }
- 
--static void dump_irqs(int spaces, GList *interrupts)
-+static void dump_irqs(int spaces, GList *dump_interrupts)
- {
- 	struct interrupt *irq;
--	while (interrupts) {
-+	while (dump_interrupts) {
- 		int i;
--		for (i=0; i<spaces;i++) printf(" ");
--		irq = interrupts->data;
-+		for (i=0; i<spaces; i++) printf(" ");
-+		irq = dump_interrupts->data;
- 		printf("Interrupt %i (%s/%u) \n", irq->number, classes[irq->class], (unsigned int)irq->workload);
--		interrupts = g_list_next(interrupts);
-+		dump_interrupts = g_list_next(dump_interrupts);
- 	}
- }
- 
-Index: placement.c
-===================================================================
---- placement.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ placement.c	(.../trunk)	(revision 33)
-@@ -272,7 +272,7 @@
- 		}
- 		if ((!cpus_empty(irq->node_mask)) &&
- 		    (!cpus_equal(irq->mask, irq->node_mask)) &&
--		    (!cpus_full(irq->node_mask))) {
-+		    (!__cpus_full(&irq->node_mask, num_possible_cpus()))) {
- 			irq->old_mask = irq->mask;
- 			irq->mask = irq->node_mask;
- 		}
-Index: cpumask.h
-===================================================================
---- cpumask.h	(.../tags/irqbalance-0.56)	(revision 33)
-+++ cpumask.h	(.../trunk)	(revision 33)
-@@ -1,7 +1,7 @@
- #ifndef __LINUX_CPUMASK_H
- #define __LINUX_CPUMASK_H
- 
--#define NR_CPUS 256
-+#define NR_CPUS 4096
- /*
-  * Cpumasks provide a bitmap suitable for representing the
-  * set of CPU's in a system, one bit position per CPU number.
-Index: bitmap.c
-===================================================================
---- bitmap.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ bitmap.c	(.../trunk)	(revision 33)
-@@ -74,6 +74,19 @@
- 	return 1;
- }
- 
-+int __bitmap_weight(const unsigned long *bitmap, int bits)
-+{
-+	int k, w = 0, lim = bits/BITS_PER_LONG;
-+
-+	for (k = 0; k < lim; k++)
-+		w += hweight_long(bitmap[k]);
-+
-+	if (bits % BITS_PER_LONG)
-+		w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
-+
-+	return w;
-+}
-+
- int __bitmap_equal(const unsigned long *bitmap1,
- 		const unsigned long *bitmap2, int bits)
- {
-Index: irqlist.c
-===================================================================
---- irqlist.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ irqlist.c	(.../trunk)	(revision 33)
-@@ -28,6 +28,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <errno.h>
- 
- #include "types.h"
- #include "irqbalance.h"
-@@ -39,6 +40,7 @@
- void get_affinity_hint(struct interrupt *irq, int number)
- {
- 	char buf[PATH_MAX];
-+	cpumask_t tempmask;
- 	char *line = NULL;
- 	size_t size = 0;
- 	FILE *file;
-@@ -51,7 +53,9 @@
- 		fclose(file);
- 		return;
- 	}
--	cpumask_parse_user(line, strlen(line), irq->node_mask);
-+	cpumask_parse_user(line, strlen(line), tempmask);
-+	if (!__cpus_full(&tempmask, num_possible_cpus()))
-+		irq->node_mask = tempmask;
- 	fclose(file);
- 	free(line);
- }
-@@ -64,7 +68,7 @@
- 	DIR *dir;
- 	struct dirent *entry;
- 	char *c, *c2;
--	int nr , count = 0;
-+	int nr , count = 0, can_set = 1;
- 	char buf[PATH_MAX];
- 	sprintf(buf, "/proc/irq/%i", number);
- 	dir = opendir(buf);
-@@ -77,7 +81,7 @@
- 			size_t size = 0;
- 			FILE *file;
- 			sprintf(buf, "/proc/irq/%i/smp_affinity", number);
--			file = fopen(buf, "r");
-+			file = fopen(buf, "r+");
- 			if (!file)
- 				continue;
- 			if (getline(&line, &size, file)==0) {
-@@ -86,7 +90,13 @@
- 				continue;
- 			}
- 			cpumask_parse_user(line, strlen(line), irq->mask);
--			fclose(file);
-+			/*
-+			 * Check that we can write the affinity, if
-+			 * not take it out of the list.
-+			 */
-+			fputs(line, file);
-+			if (fclose(file) && errno == EIO)
-+				can_set = 0;
- 			free(line);
- 		} else if (strcmp(entry->d_name,"allowed_affinity")==0) {
- 			char *line = NULL;
-@@ -119,7 +129,7 @@
- 			count++;
- 
- 	/* if there is no choice in the allowed mask, don't bother to balance */
--	if (count<2)
-+	if ((count<2) || (can_set == 0))
- 		 irq->balance_level = BALANCE_NONE;
- 		
- 
-Index: Makefile.am
-===================================================================
---- Makefile.am	(.../tags/irqbalance-0.56)	(revision 33)
-+++ Makefile.am	(.../trunk)	(revision 33)
-@@ -21,7 +21,7 @@
- # 
- 
- AUTOMAKE_OPTIONS = no-dependencies
--EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4
-+EXTRA_DIST = README INSTALL COPYING autogen.sh cap-ng.m4
-  
- INCLUDES = -I${top_srcdir} 
- LIBS = $(CAPNG_LDADD) $(GLIB_LIBS)
-@@ -31,6 +31,7 @@
- sbin_PROGRAMS = irqbalance
- irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
- 	irqlist.c network.c numa.c placement.c powermode.c procinterrupts.c
-+dist_man_MANS = irqbalance.1
- 
- CONFIG_CLEAN_FILES = debug*.list config/*
- clean-generic:
-Index: network.c
-===================================================================
---- network.c	(.../tags/irqbalance-0.56)	(revision 33)
-+++ network.c	(.../trunk)	(revision 33)
-@@ -160,10 +160,8 @@
- 	}
- 
- 	while (!feof(file)) {
--		uint64_t rxcount;
--		uint64_t txcount;
--		uint64_t delta;
--		int dummy;
-+		uint64_t dummy __attribute__((unused));
-+		uint64_t rxcount, txcount, delta;
- 		char *c, *c2;
- 		if (getline(&line, &size, file)==0)
- 			break;
diff --git a/extra/k3b/fix-crash-with-qt-4.7.0.patch b/extra/k3b/fix-crash-with-qt-4.7.0.patch
deleted file mode 100644
index a99b5c639..000000000
--- a/extra/k3b/fix-crash-with-qt-4.7.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: src/option/k3bpluginoptiontab.cpp
-===================================================================
---- src/option/k3bpluginoptiontab.cpp	(revision 1168967)
-+++ src/option/k3bpluginoptiontab.cpp	(working copy)
-@@ -43,12 +43,28 @@
-     layout->addWidget( label );
-     layout->addWidget( pluginSelector );
- 
-+    // find all categories
-+    QHash<QString, QString> categoryNames;
-+
-     foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
--        kDebug() << "Adding plugin" << plugin->pluginInfo().name();
--        pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
-+        categoryNames[ plugin->category() ] = plugin->categoryName();
-+    }
-+
-+    // add all plugins in each category
-+    foreach( const QString &category, categoryNames.keys() ) {
-+        QList<KPluginInfo> plugins;
-+
-+        foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
-+            if ( plugin->category() == category ) {
-+                plugins << plugin->pluginInfo();
-+                kDebug() << "Adding plugin" << plugin->pluginInfo().name();
-+            }
-+        }
-+        pluginSelector->addPlugins( plugins,
-                                     KPluginSelector::ReadConfigFile,
--                                    plugin->categoryName(),
--                                    plugin->category() );
-+                                    categoryNames[ category ],
-+                                    category
-+                                  );
-     }
- }
- 
diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
deleted file mode 100644
index 1c85d6fc9..000000000
--- a/extra/kdelibs/kdelibs-nepomuk-unicode.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();
\ No newline at end of file
diff --git a/extra/kdepim-runtime/smi0.91.patch b/extra/kdepim-runtime/smi0.91.patch
deleted file mode 100644
index 2229f9cd1..000000000
--- a/extra/kdepim-runtime/smi0.91.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop~	2011-10-12 10:05:55.432618174 +0000
-+++ kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop	2011-10-12 10:06:06.586046531 +0000
-@@ -89,7 +89,7 @@
- Comment[zh_TW]=地址物件的 Akonadi 序列器外掛程式
- 
- [Plugin]
--Type=text/vcard,text/directory
-+Type=text/vcard
- X-Akonadi-Class=legacy;default;KABC::Addressee;
- X-KDE-Library=akonadi_serializer_addressee
- X-KDE-ClassName=Akonadi::SerializerPluginAddressee
diff --git a/extra/kdeutils/CVE-2011-2725.patch b/extra/kdeutils/CVE-2011-2725.patch
deleted file mode 100644
index 986bebc90..000000000
--- a/extra/kdeutils/CVE-2011-2725.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/part/part.cpp
-+++ b/part/part.cpp
-@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo
-     if (!job->error()) {
-         const ArchiveEntry& entry =
-             m_model->entryForIndex(m_view->selectionModel()->currentIndex());
--        const QString fullName =
--            m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString();
-+
-+        QString fullName =
-+            m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString();
-+
-+        // Make sure a maliciously crafted archive with parent folders named ".." do
-+        // not cause the previewed file path to be located outside the temporary
-+        // directory, resulting in a directory traversal issue.
-+        fullName.remove(QLatin1String("../"));
-+
-         ArkViewer::view(fullName, widget());
-     } else {
-         KMessageBox::error(widget(), job->errorString());
diff --git a/extra/libmsn/openssl1.patch b/extra/libmsn/openssl1.patch
deleted file mode 100644
index 0ff7de898..000000000
--- a/extra/libmsn/openssl1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libmsn-4.1/msntest/msntest.cpp~	2010-04-01 15:05:13.248056050 +0200
-+++ libmsn-4.1/msntest/msntest.cpp	2010-04-01 15:07:18.938878993 +0200
-@@ -259,7 +259,13 @@
-                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
-                     {
-                         BIO *bio_socket_new;
--                        SSL_METHOD *meth=NULL;
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+			const SSL_METHOD *meth=NULL;
-+#else
-+			SSL_METHOD *meth=NULL;
-+#endif
-+
-                         meth=SSLv23_client_method();
-                         SSLeay_add_ssl_algorithms();
-                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);
diff --git a/extra/ntp/changelog b/extra/ntp/changelog
deleted file mode 100644
index 528a07826..000000000
--- a/extra/ntp/changelog
+++ /dev/null
@@ -1,25 +0,0 @@
-2011-04-03  andrea <andrea@archlinux.org>
-
-    * ntp 4.2.6p3-3
-    - Use 'ntpd -p' to get the PID in ntpd
-    - Don't run the ntp client in background in ntpdate
-
-2011-03-28  andrea <andrea@archlinux.org>
-
-    * ntp 4.2.6p3-2
-    - Improved daemon scripts
-
-2010-10-16  kevin  <kevin@archlinux.org>
-
-    * ntp 4.2.6p3
-    - Implemented FS#18469, replace ntpdate with ntpd -q
-    - Removed LIBS
-    - Removed old IPv6 and nano patch
-
-2010-10-16  kevin  <kevin@archlinux.org>
-
-    * ntp 4.2.6p2
-    - Added changelog
-    - Set LIBS to use librt since configure doesn't set it
-    - Convert PKGBUILD to build()/package() format
-    - removed "|| return 1"
diff --git a/extra/ntp/ntp-4.2.4-html2man.patch b/extra/ntp/ntp-4.2.4-html2man.patch
deleted file mode 100644
index 333d4529a..000000000
--- a/extra/ntp/ntp-4.2.4-html2man.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- ntp-4.2.4/scripts/html2man.in.html2man	2006-06-06 22:17:10.000000000 +0200
-+++ ntp-4.2.4/scripts/html2man.in	2007-01-08 12:47:31.000000000 +0100
-@@ -23,10 +23,10 @@
- 	     'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'],
- 	     'ntpdate' => ['ntpdate', 8, 'ntpd(8)'],
- 	     'ntpdc' => ['ntpdc', 8, 'ntpd(8)'],
--	     'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'],
-+	     'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
- 	     'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
- 	     'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
--	     'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
-+	     'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'],
- 	     'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
- 	     'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],
- 	     'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
-@@ -34,17 +34,8 @@
- 	     'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']);
- 
- # Disclaimer to go in SEE ALSO section of the man page
--$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' .
--    'documentation pages, which are maintained in HTML format.  These files are ' .
--    'included in the NTP source distribution.  If you installed NTP from a binary ' .
--    'package, or it came pre-installed on your system, chances are the documentation ' .
--    'was also included in the usual place for your system.  The HTML files are more ' .
--    'correct and complete than these man pages, which are provided for your reference ' .
--    'only.';
--
--# Disclaimer to go right at the top
--$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' .
--    'incorrect.  See the SEE ALSO section at the end of this file for more info';
-+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" .
-+    "This file was automatically generated from HTML source.\n";
- 
- mkdir $MANDIR, 0777;
- mkdir "$MANDIR/man8", 0777;
-@@ -64,7 +55,8 @@
-     $fileinfo = $manfiles{$filename};
- 
-     $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!";
--    open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]")
-+    $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]";
-+    open(MANOUT, ">$fileout")
- 	|| die "Can't open: $!";
- 
-     $p->get_tag("title");
-@@ -73,7 +65,6 @@
- 
-     # Setup man header
-     print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] .  "\n";
--    print MANOUT ".UC 4\n";
-     print MANOUT ".SH NAME\n";
-     $pat = $fileinfo->[0];
-     if ($name =~ /$pat/) {
-@@ -81,10 +72,12 @@
- 	# Add the manpage name, if not in the HTML title already
- 	print MANOUT "$fileinfo->[0] - ";
-     }
--    print MANOUT "$name\n\n";
--
--    print MANOUT "$top_disclaimer\n";
-+    print MANOUT "$name\n.SH \\ \n\n";
- 
-+    @fontstack = ();
-+    $deflevel = 0;
-+    $pre = 0;
-+    $ignore = 0;
-     # Now start scanning.  We basically print everything after translating some tags.
-     # $token->[0] has "T", "S", "E" for Text, Start, End
-     # $token->[1] has the tag name, or text (for "T" case)
-@@ -92,19 +85,37 @@
-     while (my $token = $p->get_token) {
- 	if($token->[0] eq "T") {
- 	    my $text = $token->[1];
--	    if($tag) {
--		$text =~ s/^[\n ]*//;
--		$text =~ s/[\n ]*$/ /;
-+	    if (!$pre) {
-+		if($tag) {
-+		    $text =~ s/^[\n\t ]*//;
-+		}
-+		$text =~ s/^[\n\t ][\n\t ]+$//;
-+		$text =~ s/[\n\t ]+/ /g;
-+		$text =~ s/&nbsp\;/ /g;
-+		$text =~ s/&gt\;/>/g;
-+		$text =~ s/&lt\;/</g;
-+		$text =~ s/&quot\;/"/g;
-+		$text =~ s/&amp\;/&/g;
-+		$text =~ s/^\./\\[char46]/;
- 	    }
--	    $text =~ s/&nbsp\;/ /g;
--	    $text =~ s/^\./\\./;
- 	    print MANOUT "$text";
- 	    $tag = 0;
- 	}
- 	if($token->[0] eq "S") {
- 	    if($token->[1] eq "h4") {
- 		my $text = uc($p->get_trimmed_text("/h4"));
--		print MANOUT ".SH $text\n";
-+		# ignore these two sections in ntpd.html
-+		if ($filename eq "ntpd" &&
-+		    ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) {
-+			$ignore = 1;
-+			close(MANOUT);
-+			open(MANOUT, ">/dev/null");
-+		} elsif ($ignore) {
-+		    $ignore = 0;
-+		    close(MANOUT);
-+		    open(MANOUT, ">>$fileout");
-+		}
-+		print MANOUT "\n\n.SH $text\n";
- 	    }
- 	    if($token->[1] eq "tt") {
- 		push @fontstack, "tt";
-@@ -118,22 +129,30 @@
- 		my $text = $p->get_trimmed_text("/address");
- 		print MANOUT "\n.SH AUTHOR\n$text\n";
- 	    }
--	    if($token->[1] eq "dt") {
--		$tmp = $deflevel-4;
--		print MANOUT "\n.RS $tmp\n";
-+	    if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) {
-+		print MANOUT "\n.TP 8\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RS $deflevel\n";
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel+=4;
-+		$deflevel+=1;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0;
-+		}
-+	    }
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
-+	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.nf";
-+		$pre = 1;
- 	    }
- 	}
- 	elsif($token->[0] eq "E") {
--	    if($token->[1] eq "dd") {
--		print MANOUT "\n.RE\n";
-+	    if($token->[1] eq "h4") {
- 		$tag = 1;
- 	    }
- 	    if($token->[1] eq "tt") {
-@@ -157,15 +176,27 @@
- 		print MANOUT "$fontswitch";
- 	    }
- 	    if($token->[1] eq "dl") {
--		$deflevel-=4;
-+		if ($deflevel > 0) {
-+		    print MANOUT "\n.RE";
-+		}
-+		print MANOUT "\n";
-+		$deflevel-=1;
- 	    }
--	    if($token->[1] eq "dt") {
--		print MANOUT "\n.RE";
-+	    if($token->[1] eq "p") {
-+		print MANOUT "\n";
- 		$tag = 1;
- 	    }
-+	    if($token->[1] eq "pre") {
-+		print MANOUT "\n.fi";
-+		$pre = 0;
-+	    }
- 	}
-     }
--    print MANOUT ".SH SEE ALSO\n\n";
-+    if ($ignore) {
-+	close(MANOUT);
-+	open(MANOUT, ">>$fileout");
-+    }
-+    print MANOUT "\n.SH SEE ALSO\n\n";
-     print MANOUT "$fileinfo->[2]\n\n";
-     print MANOUT "$seealso_disclaimer\n";
-     close(MANOUT);
diff --git a/extra/ntp/ntp-client.conf b/extra/ntp/ntp-client.conf
deleted file mode 100644
index e728db579..000000000
--- a/extra/ntp/ntp-client.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"
diff --git a/extra/thunar/org.freedesktop.udisks.pkla b/extra/thunar/org.freedesktop.udisks.pkla
deleted file mode 100644
index 5cc443bd1..000000000
--- a/extra/thunar/org.freedesktop.udisks.pkla
+++ /dev/null
@@ -1,7 +0,0 @@
-[Local Users]
-#Identity=unix-user: your_username
-Identity=unix-group:storage
-Action=org.freedesktop.udisks.*
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch
deleted file mode 100644
index 30046d233..000000000
--- a/extra/virtuoso/fix-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libsrc/Wi/xqf.c
-===================================================================
-RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v
-retrieving revision 1.21.2.9
-retrieving revision 1.21.2.12
-diff -u -r1.21.2.9 -r1.21.2.12
---- libsrc/Wi/xqf.c	3 Mar 2011 11:56:45 -0000	1.21.2.9
-+++ libsrc/Wi/xqf.c	26 Aug 2011 19:34:56 -0000	1.21.2.12
-@@ -3520,6 +3552,12 @@
-   desc = xqf_str_parser_descs + desc_idx;
-   if (DV_DB_NULL == arg_dtp)
-     return NEW_DB_NULL;
-+  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
-+  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
-+    {
-+      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
-+      goto res_ready;
-+    }
-   if (DV_STRING != arg_dtp)
-     {
-       caddr_t err = NULL;
diff --git a/extra/xfce4-session/org.freedesktop.consolekit.pkla b/extra/xfce4-session/org.freedesktop.consolekit.pkla
deleted file mode 100644
index 7f1d74ff6..000000000
--- a/extra/xfce4-session/org.freedesktop.consolekit.pkla
+++ /dev/null
@@ -1,31 +0,0 @@
-[Local restart]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local restart - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/xfce4-session/org.freedesktop.upower.pkla b/extra/xfce4-session/org.freedesktop.upower.pkla
deleted file mode 100644
index 52c74f892..000000000
--- a/extra/xfce4-session/org.freedesktop.upower.pkla
+++ /dev/null
@@ -1,15 +0,0 @@
-[Local hibernate]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local suspend]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
diff --git a/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch b/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch
deleted file mode 100644
index c23e8ec78..000000000
--- a/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Thu, 27 Jan 2011 22:29:16 +0100
-Subject: [PATCH] Fix problems with plugin and 4.8 panel.
-
----
- configure.ac                    |    2 +-
- src/smartbookmark.desktop.in.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1ba88d4..cb344f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
- dnl Check for required packages
- XDT_CHECK_LIBX11_REQUIRE()
- XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
- 
- XDT_FEATURE_DEBUG()
-diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in
-index 83464ff..7bafece 100644
---- a/src/smartbookmark.desktop.in.in
-+++ b/src/smartbookmark.desktop.in.in
-@@ -4,5 +4,5 @@ Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
- Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+X-XFCE-Module=smartbookmark
- X-XFCE-Unique=false
--- 
-1.7.3.5
-