From f10d361a5b523ce7f9289ba8d45ccd847510d619 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Mon, 16 Jul 2012 17:56:24 +0200
Subject: Use '.module' extension on module configs

 * And want alphanumeric/_.- filenames
 * Currently this is just a warning, soon it will be enforced
 * The name of a module does not include the extension

Andreas Metzler and Ubuntu both worked on this patch, and I've made
some more changes.

See https://bugs.launchpad.net/ubuntu/+source/p11-kit/+bug/911436

https://bugs.freedesktop.org/show_bug.cgi?id=52158
---
 tests/files/system-modules/one                  | 3 ---
 tests/files/system-modules/one.module           | 3 +++
 tests/files/system-modules/two                  | 5 -----
 tests/files/system-modules/two-duplicate        | 3 ---
 tests/files/system-modules/two-duplicate.module | 3 +++
 tests/files/system-modules/two.badname          | 7 +++++++
 6 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 tests/files/system-modules/one
 create mode 100644 tests/files/system-modules/one.module
 delete mode 100644 tests/files/system-modules/two
 delete mode 100644 tests/files/system-modules/two-duplicate
 create mode 100644 tests/files/system-modules/two-duplicate.module
 create mode 100644 tests/files/system-modules/two.badname

(limited to 'tests/files/system-modules')

diff --git a/tests/files/system-modules/one b/tests/files/system-modules/one
deleted file mode 100644
index 3620869..0000000
--- a/tests/files/system-modules/one
+++ /dev/null
@@ -1,3 +0,0 @@
-
-module: mock-one.so
-setting: system1
\ No newline at end of file
diff --git a/tests/files/system-modules/one.module b/tests/files/system-modules/one.module
new file mode 100644
index 0000000..3620869
--- /dev/null
+++ b/tests/files/system-modules/one.module
@@ -0,0 +1,3 @@
+
+module: mock-one.so
+setting: system1
\ No newline at end of file
diff --git a/tests/files/system-modules/two b/tests/files/system-modules/two
deleted file mode 100644
index f391757..0000000
--- a/tests/files/system-modules/two
+++ /dev/null
@@ -1,5 +0,0 @@
-
-module: mock-two.so
-setting: system2
-
-disable-in: test-disable, test-other
\ No newline at end of file
diff --git a/tests/files/system-modules/two-duplicate b/tests/files/system-modules/two-duplicate
deleted file mode 100644
index 907aa75..0000000
--- a/tests/files/system-modules/two-duplicate
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# This is a duplicate of the 'two' module
-module: mock-two.so
diff --git a/tests/files/system-modules/two-duplicate.module b/tests/files/system-modules/two-duplicate.module
new file mode 100644
index 0000000..907aa75
--- /dev/null
+++ b/tests/files/system-modules/two-duplicate.module
@@ -0,0 +1,3 @@
+
+# This is a duplicate of the 'two' module
+module: mock-two.so
diff --git a/tests/files/system-modules/two.badname b/tests/files/system-modules/two.badname
new file mode 100644
index 0000000..b6d0f7f
--- /dev/null
+++ b/tests/files/system-modules/two.badname
@@ -0,0 +1,7 @@
+# This module doesn't have a .module extension, but p11-kit doesn't yet
+# enforce the naming, just warns, so it should still be loaded
+
+module: mock-two.so
+setting: system2
+
+disable-in: test-disable, test-other
\ No newline at end of file
-- 
cgit v1.1