gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-anastasis] branch master updated: revisions to build Debian packa

From: gnunet
Subject: [taler-anastasis] branch master updated: revisions to build Debian package
Date: Fri, 18 Jun 2021 18:15:01 +0200 
This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 9fe434f  revisions to build Debian package
9fe434f is described below

commit 9fe434f1d35b1008b180f6f99cbfb526bf881d98
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jun 18 18:14:58 2021 +0200

    revisions to build Debian package
---
 debian/.gitignore                                  | 25 ++++--------
 debian/anastasis-cli.install                       |  1 +
 debian/anastasis-httpd.config                      | 44 ++++++++++++++++++++++
 debian/anastasis-httpd.install                     | 11 ++++++
 ...anastasis.postinst => anastasis-httpd.postinst} |  0
 .../{anastasis.postrm => anastasis-httpd.postrm}   |  0
 debian/{anastasis.prerm => anastasis-httpd.prerm}  |  0
 debian/anastasis.install                           | 11 ------
 debian/control                                     | 10 +++++
 debian/libanastasis-dev.install                    |  4 +-
 debian/libanastasis.install                        |  6 ++-
 debian/libanastasis.substvars                      |  2 +-
 debian/rules                                       |  3 +-
 src/authorization/Makefile.am                      | 24 +++++++++---
 src/backend/Makefile.am                            |  2 +-
 src/lib/Makefile.am                                |  5 ++-
 src/reducer/anastasis_api_recovery_redux.c         |  2 +-
 src/stasis/Makefile.am                             |  2 +
 18 files changed, 109 insertions(+), 43 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index c2b295e..7dcd9f0 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,22 +1,13 @@
 .debhelper/
+*.substvars
+*.log
+libanastasis/
+libanastasis-dev/
+anastasis-httpd/
+anastasis-cli/
+*.debhelper
 autoreconf.after
 autoreconf.before
 debhelper-build-stamp
 files
-libtalerexchange.debhelper.log
-libtalerexchange.substvars
-libtalerexchange/
-taler-exchange-dev.debhelper.log
-taler-exchange-dev.substvars
-taler-exchange-dev/
-taler-exchange.debhelper.log
-taler-exchange.substvars
-taler-exchange/
-tmp/
-libtalermerchant-dev.debhelper.log
-libtalermerchant-dev.substvars
-libtalermerchant-dev/
-libtalermerchant.debhelper.log
-libtalermerchant/
-taler-merchant.debhelper.log
-taler-merchant/
+tmp/
\ No newline at end of file
diff --git a/debian/anastasis-cli.install b/debian/anastasis-cli.install
new file mode 100644
index 0000000..79f5ce4
--- /dev/null
+++ b/debian/anastasis-cli.install
@@ -0,0 +1 @@
+usr/bin/anastasis-reducer
diff --git a/debian/anastasis-httpd.config b/debian/anastasis-httpd.config
new file mode 100644
index 0000000..334a12f
--- /dev/null
+++ b/debian/anastasis-httpd.config
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input low anastasis/username || true
+db_go
+
+db_input low anastasis/groupname || true
+db_go
+
+db_input low anastasis/reconfigure-webserver || true
+db_go
+
+# Set permissions for sqlite3 file
+# (for when we support sqlite3 in the future)
+dbc_dbfile_owner="${_USERNAME}:${_GROUPNAME}"
+dbc_dbfile_perms="0600"
+
+dbc_psql_createdb_encoding="UTF8"
+
+# Set MySQL encoding to UTF8, just in case MySQL
+# support is added in the future.
+dbc_mysql_createdb_encoding="UTF8"
+
+# Try to get it to use UNIX domain sockets, if possible.
+# (Note: doesn't seem to do much, still uses username+PW+TCP
+#  on my system :-(  dbconfig documentation sucks.).
+dbc_authmethod_user=ident
+dbc_authmethod_admin=ident
+
+
+db_get anastasis/username
+_USERNAME="${RET:-anastasis-httpd}"
+dbc_dbuser=${_USERNAME}
+
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+    . /usr/share/dbconfig-common/dpkg/config.pgsql
+    dbc_go anastasis "$@"
+fi
+
+db_stop
diff --git a/debian/anastasis-httpd.install b/debian/anastasis-httpd.install
new file mode 100644
index 0000000..4cbdef6
--- /dev/null
+++ b/debian/anastasis-httpd.install
@@ -0,0 +1,11 @@
+usr/bin/
+usr/lib/*/anastasis/
+usr/lib/*/libanastasisauthorization.*
+usr/lib/*/libanastasisdb.*
+usr/share/man/man1/*
+usr/share/anastasis/*
+usr/share/anastasis/sql/*
+usr/share/anastasis/config.d/*
+debian/etc/* /etc/
+debian/conf/* etc/anastasis/
+debian/db/install/* usr/share/dbconfig-common/scripts/anastasis/install/
diff --git a/debian/anastasis.postinst b/debian/anastasis-httpd.postinst
similarity index 100%
rename from debian/anastasis.postinst
rename to debian/anastasis-httpd.postinst
diff --git a/debian/anastasis.postrm b/debian/anastasis-httpd.postrm
similarity index 100%
rename from debian/anastasis.postrm
rename to debian/anastasis-httpd.postrm
diff --git a/debian/anastasis.prerm b/debian/anastasis-httpd.prerm
similarity index 100%
rename from debian/anastasis.prerm
rename to debian/anastasis-httpd.prerm
diff --git a/debian/anastasis.install b/debian/anastasis.install
deleted file mode 100644
index 8776529..0000000
--- a/debian/anastasis.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/bin/
-usr/lib/*/taler/*.so
-usr/lib/*/libtaleranastasis_plugin*.so.*
-usr/share/man/man1/*
-/usr/share/info/anastasis*
-/usr/share/anastasis/*
-/usr/share/anastasis/sql/*
-/usr/share/anastasis/config.d/*
-debian/etc/* /etc/
-debian/conf/* etc/anastasis/
-debian/db/install/* usr/share/dbconfig-common/scripts/anastasis/install/
diff --git a/debian/control b/debian/control
index 1223325..e59bd25 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,16 @@ Depends:
  ${shlibs:Depends}
 Description: GNU's key escrow provider.
 
+Package: anastasis-cli
+Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ libanastasis (>= 0.0.0),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Command-line interface for the Anastasis key escrow provider 
service.
+
 Package: libanastasis-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/libanastasis-dev.install b/debian/libanastasis-dev.install
index cc6e280..38d21e9 100644
--- a/debian/libanastasis-dev.install
+++ b/debian/libanastasis-dev.install
@@ -1,4 +1,2 @@
-usr/bin/taler-merchant-benchmark
 usr/include
-usr/lib/*/*.so
-usr/lib/*/libtalermerchanttesting.so.*
+usr/lib/*/libanastasistesting.*
\ No newline at end of file
diff --git a/debian/libanastasis.install b/debian/libanastasis.install
index 695e147..49fc653 100644
--- a/debian/libanastasis.install
+++ b/debian/libanastasis.install
@@ -1 +1,5 @@
-usr/lib/*/libanastasis*.so.*
+usr/lib/*/libanastasis.so*
+usr/lib/*/libanastasis*.so*
+usr/bin/anastasis-reducer
+usr/share/anastasis/redux.*
+usr/share/info/anastasis*
diff --git a/debian/libanastasis.substvars b/debian/libanastasis.substvars
index 749dae5..a72bec5 100644
--- a/debian/libanastasis.substvars
+++ b/debian/libanastasis.substvars
@@ -1,3 +1,3 @@
-shlibs:Depends=libc6 (>= 2.14), libcurl3-gnutls (>= 7.16.2), libgnunet (>= 
0.14.0), libjansson4 (>= 2.0.1), libtalerexchange (>= 0.9.0), libtalermerchant 
(>= 0.9.0)
+shlibs:Depends=libanastasis (>= 0.0.0), libc6 (>= 2.14), libcurl3-gnutls (>= 
7.16.2), libgcrypt20 (>= 1.8.0), libgnunet (>= 0.14.1), libjansson4 (>= 2.3), 
libltdl7 (>= 2.4.6), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0), 
zlib1g (>= 1:1.2.0)
 misc:Depends=
 misc:Pre-Depends=
diff --git a/debian/rules b/debian/rules
index 9c28540..8535c4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ override_dh_auto_install-arch:
        # Removing useless files
        rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
                debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/anastasis/*.la \
-               debian/tmp/usr/share/doc/anastasis/COPYING 
+               debian/tmp/usr/share/doc/anastasis/COPYING
 
 override_dh_auto_install-indep:
 
@@ -34,5 +34,6 @@ override_dh_auto_clean:
 override_dh_install:
        dh_install
        cd debian/libanastasis-dev; find . -type f -exec rm -f 
../anastasis-httpd/{} \;
+       cd debian/anastasis-cli; find . -type f -exec rm -f 
../anastasis-httpd/{} \;
        cd debian/libanastasis-dev; find . -type f -exec rm -f 
../libanastasis/{} \;
        cd debian/libanastasis; find . -type f -exec rm -f 
../anastasis-httpd/{} \;
diff --git a/src/authorization/Makefile.am b/src/authorization/Makefile.am
index f4bcc94..8ea7e86 100644
--- a/src/authorization/Makefile.am
+++ b/src/authorization/Makefile.am
@@ -26,8 +26,10 @@ libanastasisauthorization_la_SOURCES = \
 libanastasisauthorization_la_LIBADD = \
   $(LTLIBINTL)
 libanastasisauthorization_la_LDFLAGS = \
-  -talerutil \
+  -ltalerutil \
   -lgnunetutil \
+  -lmicrohttpd \
+  -lltdl \
   $(XLIB)
 
 plugin_LTLIBRARIES = \
@@ -41,10 +43,13 @@ libanastasis_plugin_authorization_file_la_LIBADD = \
   $(LTLIBINTL)
 libanastasis_plugin_authorization_file_la_LDFLAGS = \
   $(ANASTASIS_PLUGIN_LDFLAGS) \
-  -ljansson \
   -ltalerjson \
+  -ltalermhd \
   -ltalerutil \
+  -lgnunetjson \
   -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
   $(XLIB)
 
 libanastasis_plugin_authorization_email_la_SOURCES = \
@@ -53,10 +58,13 @@ libanastasis_plugin_authorization_email_la_LIBADD = \
   $(LTLIBINTL)
 libanastasis_plugin_authorization_email_la_LDFLAGS = \
   $(ANASTASIS_PLUGIN_LDFLAGS) \
-  -ljansson \
   -ltalerjson \
+  -ltalermhd \
   -ltalerutil \
+  -lgnunetjson \
   -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
   $(XLIB)
 
 libanastasis_plugin_authorization_post_la_SOURCES = \
@@ -65,10 +73,13 @@ libanastasis_plugin_authorization_post_la_LIBADD = \
   $(LTLIBINTL)
 libanastasis_plugin_authorization_post_la_LDFLAGS = \
   $(ANASTASIS_PLUGIN_LDFLAGS) \
-  -ljansson \
   -ltalerjson \
+  -ltalermhd \
   -ltalerutil \
+  -lgnunetjson \
   -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
   $(XLIB)
 
 libanastasis_plugin_authorization_sms_la_SOURCES = \
@@ -77,8 +88,11 @@ libanastasis_plugin_authorization_sms_la_LIBADD = \
   $(LTLIBINTL)
 libanastasis_plugin_authorization_sms_la_LDFLAGS = \
   $(ANASTASIS_PLUGIN_LDFLAGS) \
-  -ljansson \
   -ltalerjson \
+  -ltalermhd \
   -ltalerutil \
+  -lgnunetjson \
   -lgnunetutil \
+  -ljansson \
+  -lmicrohttpd \
   $(XLIB)
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 8dd57fd..1046810 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -28,7 +28,6 @@ anastasis_httpd_LDADD = \
   $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/stasis/libanastasisdb.la \
   $(top_builddir)/src/authorization/libanastasisauthorization.la \
-  -lmicrohttpd \
   -ljansson \
   -ltalermerchant \
   -ltalermhd \
@@ -38,6 +37,7 @@ anastasis_httpd_LDADD = \
   -lgnunetrest \
   -lgnunetjson \
   -lgnunetutil \
+  -lmicrohttpd \
   -luuid \
   $(XLIB)
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 31dac24..07460d4 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,9 +18,10 @@ libanastasis_la_SOURCES = \
 libanastasis_la_LIBADD = \
   $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/restclient/libanastasisrest.la \
-  -lgnunetutil \
-  -ljansson \
   -ltalerutil \
   -ltalermerchant \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
   -lz \
   $(XLIB)
diff --git a/src/reducer/anastasis_api_recovery_redux.c 
b/src/reducer/anastasis_api_recovery_redux.c
index 5cbfd6c..95c5b0f 100644
--- a/src/reducer/anastasis_api_recovery_redux.c
+++ b/src/reducer/anastasis_api_recovery_redux.c
@@ -192,7 +192,7 @@ update_state_by_error (json_t *state,
                        enum ANASTASIS_RecoveryStatus rc)
 {
   const char *msg = NULL;
-  enum TALER_ErrorCode ec;
+  enum TALER_ErrorCode ec = TALER_EC_INVALID;
 
   switch (rc)
   {
diff --git a/src/stasis/Makefile.am b/src/stasis/Makefile.am
index 404958d..8affa9e 100644
--- a/src/stasis/Makefile.am
+++ b/src/stasis/Makefile.am
@@ -50,6 +50,7 @@ libanastasisdb_la_LIBADD = \
   -lgnunetpq \
   -lpq \
   -lgnunetutil \
+  -lltdl \
   $(XLIB)
 libanastasisdb_la_LDFLAGS = \
    $(POSTGRESQL_LDFLAGS) \
@@ -61,6 +62,7 @@ libanastasis_plugin_db_postgres_la_SOURCES = \
 libanastasis_plugin_db_postgres_la_LIBADD = \
   $(LTLIBINTL)
 libanastasis_plugin_db_postgres_la_LDFLAGS = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(ANASTASIS_PLUGIN_LDFLAGS) \
   -lgnunetpq \
   -lpq \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]