gentoo resync : 28.04.2021

2 files changed, 58 insertions, 10 deletions

diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.2.2-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.2.2-gentoo.patch
new file mode 100644
index 000000000000..541464723f83
--- /dev/null
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.2.2-gentoo.patch
@@ -0,0 +1,51 @@
+--- a/lf_update_issue_order.c	2021-04-10 18:32:19.101947834 +0200
++++ b/lf_update_issue_order.c	2021-04-10 18:36:07.377117090 +0200
+@@ -1,3 +1,5 @@
++#define _GNU_SOURCE
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -417,7 +419,7 @@
+       logging = 1;
+     }
+     for (i=argb; i<argc; i++) len += strlen(argv[i]) + 1;
+-    conninfo = malloc(len * sizeof(char));
++    conninfo = malloc(len * sizeof(char) + 1);
+     if (!conninfo) {
+       fprintf(stderr, "Error: Could not allocate memory for conninfo string.\n");
+       abort();
+--- a/lf_update_suggestion_order.c	2021-04-10 18:38:31.138743181 +0200
++++ b/lf_update_suggestion_order.c	2021-04-10 18:39:29.851786017 +0200
+@@ -1,3 +1,5 @@
++#define _GNU_SOURCE
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -474,7 +476,7 @@
+       logging = 1;
+     }
+     for (i=argb; i<argc; i++) len += strlen(argv[i]) + 1;
+-    conninfo = malloc(len * sizeof(char));
++    conninfo = malloc(len * sizeof(char) + 1);
+     if (!conninfo) {
+       fprintf(stderr, "Error: Could not allocate memory for conninfo string.\n");
+       abort();
+--- a/lf_update.c	2021-04-10 18:40:48.036510216 +0200
++++ b/lf_update.c	2021-04-10 18:55:46.869758233 +0200
+@@ -1,3 +1,5 @@
++#define _GNU_SOURCE
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -51,7 +53,7 @@
+   {
+     size_t len = 0;
+     for (i=1; i<argc; i++) len += strlen(argv[i]) + 1;
+-    conninfo = malloc(len * sizeof(char));
++    conninfo = malloc(len * sizeof(char) + 1);
+     if (!conninfo) {
+       fprintf(stderr, "Error: Could not allocate memory for conninfo string\n");
+       return 1;
diff --git a/www-apps/liquid_feedback_core/files/postinstall-en.txt b/www-apps/liquid_feedback_core/files/postinstall-en.txt
index 128c7b20ee7d..e1eb550eeea1 100644
--- a/www-apps/liquid_feedback_core/files/postinstall-en.txt
+++ b/www-apps/liquid_feedback_core/files/postinstall-en.txt
@@ -1,25 +1,22 @@
-Merge info from README file with these.
-
 To use Liquid Feedback you have to follow these
 simple steps, which have to be done as the postgres system user (or
 which ever is the database superuser):
 
-$ createuser liquid_feedback
-and answer the following
-Shall the new role be a superuser? (y/n) n
-Shall the new role be allowed to create databases? (y/n) y
-Shall the new role be allowed to create more new roles? (y/n) n
+$ createuser -d liquid_feedback
 
 $ psql 
 postgres=# ALTER USER liquid_feedback WITH PASSWORD 'the_new_password';
 
 $ createdb -U liquid_feedback liquid_feedback
 $ psql -U liquid_feedback liquid_feedback
-liquid_feedback=# \i /usr/share/liquid_feedback_code/core.sql
-liquid_feedback=# \i /usr/share/liquid_feedback_code/init.sql
+liquid_feedback=# \i /usr/share/liquid_feedback_core/core.sql
 INSERT INTO system_setting (member_ttl) VALUES ('1 year');
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 hour', 20, 6);
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (false, '1 day', 80, 12);
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 hour', 200, 60);
 INSERT INTO contingent (polling, time_frame, text_entry_limit, initiative_limit) VALUES (true, '1 day', 800, 120);
-INSERT INTO policy (index, name, admission_time, discussion_time, verification_time, voting_time, issue_quorum_num, issue_quorum_den, initiative_quorum_num, initiative_quorum_den) VALUES (1, 'Default policy', '8 days', '15 days', '8 days', '15 days', 10, 100, 10, 100);
+
+and Create an invite code for an admin user:
+
+$ psql -U liquid_feedback liquid_feedback
+liquid_feedback=# INSERT INTO member (invite_code, admin) VALUES ('sesam', true);